diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-18 00:59:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-18 00:59:21 +0400 |
| commit | c628f04a7c39bcd178d06448f9ca5e9324141f50 (patch) | |
| tree | 2ea3cf5870eb22560f619ffe9cf9819f8e44d56c | |
| parent | 0aa9ab69ccafdeff231927ff66ca8e87d4de8143 (diff) | |
- Fixed linking errors of blender player with CMake and XDND enabled
- Rest of changes to make XDND switch-off-able: link against extern_xdnd only
if XDND is enabled
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 223df9c8b6a..7a63435c215 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -184,6 +184,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_carve) endif() + if(WITH_GHOST_XDND) + list(APPEND BLENDER_SORTED_LIBS extern_xdnd) + endif() + if(WITH_CODEC_QUICKTIME) list(APPEND BLENDER_SORTED_LIBS bf_quicktime) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index fa4ec285249..d9e82048db2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -829,7 +829,6 @@ endif() extern_minilzo extern_lzma extern_colamd - extern_xdnd ge_logic_ketsji extern_recastnavigation ge_phys_common @@ -893,6 +892,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_carve) endif() + if(WITH_GHOST_XDND) + list(APPEND BLENDER_SORTED_LIBS extern_xdnd) + endif() + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) |