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

Fix scope on preprocessor variables for Max plugin.

Browse Source 
plAudioCore needs to know whether we intend to build the plugin, so
the change introduced in 978edc1 was causing compilation to fail when
building the plugin.

This moves detection and definition back into the root CMakeList,
but preserves the behavior of only looking for the SDK if needed.
This commit is contained in:
Joseph Davies
2014-04-25 21:56:23 -07:00
parent c3d8e7e161
commit 81214699ae
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -100,6 +100,12 @@ option(PLASMA_BUILD_RESOURCE_DAT "Do we want to build resource.dat?" ON)
option(PLASMA_BUILD_LAUNCHER "Do we want to build plUruLauncher?" ON) option(PLASMA_BUILD_LAUNCHER "Do we want to build plUruLauncher?" ON)
option(PLASMA_BUILD_TOOLS "Do we want to build the Plasma tools?" ON) option(PLASMA_BUILD_TOOLS "Do we want to build the Plasma tools?" ON)
option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
if(3dsm_BUILD_PLUGIN)
find_package(MaxSDK REQUIRED)
add_definitions(-DBUILDING_MAXPLUGIN)
endif(3dsm_BUILD_PLUGIN)
option(USE_VLD "Build and link with Visual Leak Detector (MSVC only)" OFF) option(USE_VLD "Build and link with Visual Leak Detector (MSVC only)" OFF)
if(USE_VLD) if(USE_VLD)
add_definitions(-DUSE_VLD) add_definitions(-DUSE_VLD)

5
Sources/Tools/CMakeLists.txt
View File

@ -8,12 +8,7 @@ if(PLASMA_BUILD_TOOLS)
endif() endif()
# Max Stuff goes below here... # Max Stuff goes below here...
option(3dsm_BUILD_PLUGIN "Do we want to build the 3ds Max plugin?" OFF)
if(3dsm_BUILD_PLUGIN) if(3dsm_BUILD_PLUGIN)
find_package(MaxSDK REQUIRED)
add_definitions(-DBUILDING_MAXPLUGIN)
add_definitions(-DMAXPLUGINCODE)
add_subdirectory(MaxComponent) add_subdirectory(MaxComponent)
add_subdirectory(MaxConvert) add_subdirectory(MaxConvert)
add_subdirectory(MaxExport) add_subdirectory(MaxExport)