svn merge -r40166:40279 ^/trunk/blender
[blender.git] / source / creator / CMakeLists.txt
index 8b157b2798be7e3df7ffd1701881f101c74e7e26..22fe0a1a1d1f2ab465675dba64a54caf71315518 100644 (file)
@@ -435,12 +435,12 @@ elseif(WIN32)
                        PATTERN ".svn" EXCLUDE
                )
 
-               if(NOT CMAKE_CL_64)
-                       install(
-                               FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-                               DESTINATION ${TARGETDIR}
-                       )
+               install(
+                       FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
+                       DESTINATION ${TARGETDIR}
+               )
 
+               if(NOT CMAKE_CL_64)
                        install(
                                FILES ${LIBDIR}/iconv/lib/iconv.dll
                                DESTINATION ${TARGETDIR}
@@ -712,7 +712,11 @@ add_dependencies(blender makesdna)
 
 get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
 
-set(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
+set(BLENDER_LINK_LIBS
+       ${BLENDER_LINK_LIBS}
+       bf_windowmanager
+       bf_render
+)
 
 if(WITH_MOD_FLUID)
        list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
@@ -799,6 +803,7 @@ endif()
                extern_minilzo
                extern_lzma
                ge_logic_ketsji
+               extern_recastnavigation
                ge_phys_common
                ge_logic
                ge_rasterizer
@@ -806,7 +811,6 @@ endif()
                ge_logic_expressions
                ge_scenegraph
                ge_logic_network
-               bf_python # duplicate for BPY_driver_exec
                ge_logic_ngnetwork
                extern_bullet
                ge_logic_loopbacknetwork