From acbe1a6631de7dfe5f5b7ea085b484cbfa86939d Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 10 Apr 2011 20:42:36 -0700 Subject: [PATCH] Some minor fixes for the FindDirectX script --- MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt | 6 ------ .../Sources/Plasma/Apps/plClient/CMakeLists.txt | 12 ++++++------ .../FeatureLib/pfConsole/pfConsoleCommands.cpp | 2 +- .../Plasma20/cmake/FindDirectX.cmake | 10 +++++++++- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt index 8e56a6ae..8e2b6a84 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/CMakeLists.txt +++ b/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) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt index a82f6903..3907c400 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/CMakeLists.txt +++ b/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}) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp index f5f7948f..71e26855 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp +++ b/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" diff --git a/MOULOpenSourceClientPlugin/Plasma20/cmake/FindDirectX.cmake b/MOULOpenSourceClientPlugin/Plasma20/cmake/FindDirectX.cmake index 91d6c025..38128011 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/cmake/FindDirectX.cmake +++ b/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()