From de9d463563f8fdf0165abf2c791f2215dff2bc96 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 24 Oct 2011 20:57:33 -0700 Subject: [PATCH] Semi-hack to CMake to ignore DirectX on Linux. --- CMakeLists.txt | 8 ++++++-- Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt | 2 +- Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt | 4 +++- Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt | 4 +++- Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt | 4 +++- Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt | 6 ++++-- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a878f77..7a981a79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,17 @@ find_package(OpenAL REQUIRED) find_package(PythonLibs REQUIRED) find_package(EXPAT REQUIRED) find_package(ZLIB REQUIRED) -find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client find_package(PNG REQUIRED) find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client -find_package(DirectX REQUIRED) find_package(CURL REQUIRED) + +if(WIN32) + find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client + find_package(DirectX REQUIRED) +endif(WIN32) + find_package(MaxSDK) #TODO: Only find this if we are building PlasmaMax find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built... # Or better yet, just eliminate bink altogether diff --git a/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt index e17488bd..cdd37436 100644 --- a/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt +++ b/Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt @@ -6,9 +6,9 @@ include_directories(../../PubUtilLib) if(Bink_SDK_AVAILABLE) include_directories(${Bink_INCLUDE_DIR}) endif() -include_directories(${DirectX_INCLUDE_DIR}) if(WIN32) + include_directories(${DirectX_INCLUDE_DIR}) add_definitions(-DWIN32) endif(WIN32) diff --git a/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt index 27da66ce..d29ffb16 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt @@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") -include_directories(${DirectX_INCLUDE_DIR}) +if(WIN32) + include_directories(${DirectX_INCLUDE_DIR}) +endif(WIN32) include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${Speex_INCLUDE_DIR}) diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt index 5bfab358..51fb681a 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt @@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") -include_directories(${DirectX_INCLUDE_DIR}) +if(WIN32) + include_directories(${DirectX_INCLUDE_DIR}) +endif(WIN32) include_directories(${Ogg_INCLUDE_DIR}) include_directories(${Vorbis_INCLUDE_DIR}) diff --git a/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt index 27f7f818..10d501db 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt @@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc") include_directories("../../NucleusLib") include_directories("../../PubUtilLib") -include_directories(${DirectX_INCLUDE_DIR}) +if(WIN32) + include_directories(${DirectX_INCLUDE_DIR}) +endif(WIN32) include_directories(${OPENAL_INCLUDE_DIR}) set(plInputCore_SOURCES diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt index 17d27432..e956ee5f 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt @@ -7,7 +7,9 @@ include_directories("../../PubUtilLib") if(Bink_SDK_AVAILABLE) include_directories(${Bink_INCLUDE_DIR}) endif() -include_directories(${DirectX_INCLUDE_DIR}) +if(WIN32) + include_directories(${DirectX_INCLUDE_DIR}) +endif(WIN32) set(plPipeline_SOURCES hsG3DDeviceSelector.cpp @@ -89,4 +91,4 @@ add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS} ${plPi source_group("Source Files" FILES ${plPipeline_SOURCES}) source_group("Header Files" FILES ${plPipeline_HEADERS}) -source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS}) \ No newline at end of file +source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS})