OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Semi-hack to CMake to ignore DirectX on Linux.

Browse Source
This commit is contained in:
Darryl Pogue
2011-10-24 20:57:33 -07:00
parent 51c46a106e
commit de9d463563
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -10,13 +10,17 @@ find_package(OpenAL REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
find_package(EXPAT REQUIRED) find_package(EXPAT REQUIRED)
find_package(ZLIB 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(PNG REQUIRED)
find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client 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(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(Speex REQUIRED) #TODO: Not required if we aren't building the client
find_package(DirectX REQUIRED)
find_package(CURL 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(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... find_package(Bink) #TODO: Find Bink, but don't require it if plPipeline isn't built...
# Or better yet, just eliminate bink altogether # Or better yet, just eliminate bink altogether

2
Sources/Plasma/FeatureLib/pfSurface/CMakeLists.txt
View File

@ -6,9 +6,9 @@ include_directories(../../PubUtilLib)
if(Bink_SDK_AVAILABLE) if(Bink_SDK_AVAILABLE)
include_directories(${Bink_INCLUDE_DIR}) include_directories(${Bink_INCLUDE_DIR})
endif() endif()
include_directories(${DirectX_INCLUDE_DIR})
if(WIN32) if(WIN32)
include_directories(${DirectX_INCLUDE_DIR})
add_definitions(-DWIN32) add_definitions(-DWIN32)
endif(WIN32) endif(WIN32)

4
Sources/Plasma/PubUtilLib/plAudio/CMakeLists.txt
View File

@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${DirectX_INCLUDE_DIR}) if(WIN32)
include_directories(${DirectX_INCLUDE_DIR})
endif(WIN32)
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
include_directories(${Speex_INCLUDE_DIR}) include_directories(${Speex_INCLUDE_DIR})

4
Sources/Plasma/PubUtilLib/plAudioCore/CMakeLists.txt
View File

@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${DirectX_INCLUDE_DIR}) if(WIN32)
include_directories(${DirectX_INCLUDE_DIR})
endif(WIN32)
include_directories(${Ogg_INCLUDE_DIR}) include_directories(${Ogg_INCLUDE_DIR})
include_directories(${Vorbis_INCLUDE_DIR}) include_directories(${Vorbis_INCLUDE_DIR})

4
Sources/Plasma/PubUtilLib/plInputCore/CMakeLists.txt
View File

@ -3,7 +3,9 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib") include_directories("../../NucleusLib")
include_directories("../../PubUtilLib") include_directories("../../PubUtilLib")
include_directories(${DirectX_INCLUDE_DIR}) if(WIN32)
include_directories(${DirectX_INCLUDE_DIR})
endif(WIN32)
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
set(plInputCore_SOURCES set(plInputCore_SOURCES

6
Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
View File

@ -7,7 +7,9 @@ include_directories("../../PubUtilLib")
if(Bink_SDK_AVAILABLE) if(Bink_SDK_AVAILABLE)
include_directories(${Bink_INCLUDE_DIR}) include_directories(${Bink_INCLUDE_DIR})
endif() endif()
include_directories(${DirectX_INCLUDE_DIR}) if(WIN32)
include_directories(${DirectX_INCLUDE_DIR})
endif(WIN32)
set(plPipeline_SOURCES set(plPipeline_SOURCES
hsG3DDeviceSelector.cpp hsG3DDeviceSelector.cpp
@ -89,4 +91,4 @@ add_library(plPipeline STATIC ${plPipeline_SOURCES} ${plPipeline_HEADERS} ${plPi
source_group("Source Files" FILES ${plPipeline_SOURCES}) source_group("Source Files" FILES ${plPipeline_SOURCES})
source_group("Header Files" FILES ${plPipeline_HEADERS}) source_group("Header Files" FILES ${plPipeline_HEADERS})
source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS}) source_group("DeviceRefs" FILES ${plPipeline_DEVICEREFS})