Some minor fixes for the FindDirectX script

MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt

@@ -17,12 +17,6 @@ find_package(DirectX REQUIRED)
 #find_package(BINK REQUIRED)  #TODO: Find Bink, but don't require it if plPipeline isn't built...
 #                                    Or better yet, just eliminate bink altogether
 
-option(DirectX_OLD_SDK "Is this an old (November 2008) version of the SDK?" OFF)
-
-if (DirectX_OLD_SDK)
-    add_definitions(-DDX_OLD_SDK)
-endif(DirectX_OLD_SDK)
-
 option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
 
 if(PLASMA_EXTERNAL_RELEASE)

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt

@@ -190,14 +190,14 @@ target_link_libraries(plClient ${PHYSX_LIBRARIES})
 target_link_libraries(plClient ${Ogg_LIBRARIES})
 target_link_libraries(plClient ${Vorbis_LIBRARIES})
 target_link_libraries(plClient ${DirectX_LIBRARIES})
-target_link_libraries(plClient strmiids)
 
 if (WIN32)
-		target_link_libraries(plClient Rpcrt4.lib)
-		target_link_libraries(plClient Winhttp)
-		target_link_libraries(plClient Version.lib)
-		target_link_libraries(plClient Vfw32.lib)
-		target_link_libraries(plClient Ws2_32.lib)
+	target_link_libraries(plClient Rpcrt4)
+	target_link_libraries(plClient Winhttp)
+	target_link_libraries(plClient Version)
+	target_link_libraries(plClient Vfw32)
+	target_link_libraries(plClient Ws2_32)
+	target_link_libraries(plClient strmiids)
 endif(WIN32)
 
 source_group("Source Files" FILES ${plClient_SOURCES})

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -118,7 +118,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plScene/plPageTreeMgr.h"
 #include "plScene/plPostEffectMod.h"
 #include "pnMessage/plNodeRefMsg.h"
-//#include "../pnMessage/plWarpMsg.h"
+//#include "pnMessage/plWarpMsg.h"
 #include "hsResMgr.h"
 
 #include "plParticleSystem/plParticleSystem.h"

MOULOpenSourceClientPlugin/Plasma20/cmake/FindDirectX.cmake

@@ -1,3 +1,10 @@
+option(DirectX_OLD_SDK "Is this an old (November 2008) version of the SDK?" OFF)
+
+if (DirectX_OLD_SDK)
+	add_definitions(-DDX_OLD_SDK)
+endif(DirectX_OLD_SDK)
+
+
 if(DirectX_INCLUDE_DIR AND DirectX_LIBRARY)
 	set(DirectX_FIND_QUIETLY TRUE)
 endif()
@@ -54,7 +61,8 @@ set(DirectX_LIBRARIES
 )
 
 
-if(DirectX_INCLUDE_DIR AND DirectX_LIBRARY)
+if(DirectX_INCLUDE_DIR AND DirectX_d3d9 AND DirectX_d3dx9 AND DirectX_dinput8
+                       AND DirectX_dsound AND DirectX_dxguid AND DirectX_dxerr)
 	set(DirectX_FOUND TRUE)
 endif()