CMake: Fix build after nodes changes (including GE linking)

diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index d144abcbc6a1de6033ffdc7702d1fbc56472acb5..4a2fc330077ebf61ffe7b0b3bee65c43514e4a6a 100644 (file)
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -66,8 +66,6 @@ IF(UNIX)
     bf_decimation 
     bf_blenloader 
     bf_blenpluginapi 
     bf_decimation 
     bf_blenloader 
     bf_blenpluginapi 

-    bf_imbuf 
-    bf_avi 

     bf_blroutines 
     bf_converter 
     bf_sumo 
     bf_blroutines 
     bf_converter 
     bf_sumo 


@@ -85,6 +83,9 @@ IF(UNIX)
     bf_moto 
     bf_soundsystem 
     bf_kernel 
     bf_moto 
     bf_soundsystem 
     bf_kernel 

+    bf_nodes
+    bf_imbuf
+    bf_avi 

     kx_network 
     bf_ngnetwork 
     bf_loopbacknetwork 
     kx_network 
     bf_ngnetwork 
     bf_loopbacknetwork 

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index d3e144726b11eaa739419ffa2489284d63b5cb07..6729d5099f065875bf42efa222a3fd3137b801d5 100644 (file)
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -57,10 +57,6 @@ IF(WITH_FFMPEG)
   ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
   ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 

-IF(WITH_PLAYER)
-  SUBDIRS(bad_level_call_stubs)
-ENDIF(WITH_PLAYER)
-

 ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
 
 BLENDERLIB(bf_nodes "${SRC}" "${INC}")
 ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
 
 BLENDERLIB(bf_nodes "${SRC}" "${INC}")