- 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 223df9c8b6abb1e2ce8178a38f42754b5a9c6794..7a63435c215867b67ce4a80b0d7f4296b2cf671d 100644 (file)
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -184,6 +184,10 @@ endif()
                list(APPEND BLENDER_SORTED_LIBS extern_carve)
        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()
        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 fa4ec2852497a5139058dd555a0795e4a88ff864..d9e82048db2d1e345a6a3d24ffad10ca2fff4b40 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -829,7 +829,6 @@ endif()
                extern_minilzo
                extern_lzma
                extern_colamd
                extern_minilzo
                extern_lzma
                extern_colamd

-               extern_xdnd

                ge_logic_ketsji
                extern_recastnavigation
                ge_phys_common
                ge_logic_ketsji
                extern_recastnavigation
                ge_phys_common


@@ -893,6 +892,10 @@ endif()
                list(APPEND BLENDER_SORTED_LIBS extern_carve)
        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})
        foreach(SORTLIB ${BLENDER_SORTED_LIBS})
                set(REMLIB ${SORTLIB})
                foreach(SEARCHLIB ${BLENDER_LINK_LIBS})