[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44213] trunk/blender/source: - Fixed linking errors of blender player with CMake and XDND enabled

[Sergey Sharybin]

Revision: 44213
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44213
Author:   nazgul
Date:     2012-02-17 20:59:21 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
- 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

Modified Paths:
--------------
    trunk/blender/source/blenderplayer/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2012-02-17 20:56:25 UTC (rev 44212)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2012-02-17 20:59:21 UTC (rev 44213)
@@ -184,6 +184,10 @@
 		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()

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-02-17 20:56:25 UTC (rev 44212)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-02-17 20:59:21 UTC (rev 44213)
@@ -829,7 +829,6 @@
 		extern_minilzo
 		extern_lzma
 		extern_colamd
-		extern_xdnd
 		ge_logic_ketsji
 		extern_recastnavigation
 		ge_phys_common
@@ -893,6 +892,10 @@
 		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})