Merging r50049 through r50076 from trunk into soc-2011-tomato
[blender.git] / source / blenderplayer / CMakeLists.txt
index bb40ac71269e93fbb680294463ccf4d300dcc74e..04d4be0503497d620efc5f7e9e86b3a55efe339c 100644 (file)
@@ -110,7 +110,7 @@ endif()
                ge_scenegraph
                bf_ikplugin
                bf_intern_itasc
-               bf_intern_ik
+               bf_intern_iksolver
                bf_intern_smoke
                bf_modifiers
                bf_intern_moto 
@@ -175,11 +175,10 @@ endif()
 
        if(WITH_MOD_BOOLEAN)
                list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp)
-               list(APPEND BLENDER_SORTED_LIBS bf_intern_bop)
                list(APPEND BLENDER_SORTED_LIBS bf_intern_moto)
        endif()
 
-       if(WITH_CARVE)
+       if(WITH_MOD_BOOLEAN)
                list(APPEND BLENDER_SORTED_LIBS extern_carve)
        endif()