Merged changes in the trunk up to revision 36551.
[blender.git] / source / creator / CMakeLists.txt
index 3d18b6c4c08bf7c9f3329d6096ad7216ea9d2b1a..13e7bb10e3825bc585a596458e6c98d3abe899db 100644 (file)
@@ -83,10 +83,7 @@ if(WITH_PYTHON)
 endif()
 
 if(WITH_GAMEENGINE)
-       blender_include_dirs(
-               ../kernel/gen_messaging
-               ../kernel/gen_system
-       )
+       blender_include_dirs(../gameengine/BlenderRoutines)
 
        add_definitions(-DWITH_GAMEENGINE)
 endif()
@@ -780,7 +777,6 @@ endif()
                bf_collada
                bf_intern_bsp
                bf_intern_bop
-               bf_gen_system
                bf_intern_decimate
                bf_intern_elbeem
                bf_intern_ik
@@ -802,7 +798,6 @@ endif()
                ge_logic_expressions
                ge_scenegraph
                ge_logic_network
-               bf_gen_system
                bf_python # duplicate for BPY_driver_exec
                ge_logic_ngnetwork
                extern_bullet
@@ -818,6 +813,10 @@ endif()
                bf_intern_mikktspace
        )
 
+    if(WITH_MOD_CLOTH_ELTOPO)
+               list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
+    endif()
+
     if(WITH_BUILTIN_GLEW)
                list(APPEND BLENDER_SORTED_LIBS extern_glew)
     endif()