From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Fri, 17 Feb 2012 20:59:21 +0000 (+0000)
Subject: - Fixed linking errors of blender player with CMake and XDND enabled
X-Git-Tag: v2.63~1497
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/c628f04a7c39bcd178d06448f9ca5e9324141f50

- 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
---

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})