svn merge ^/trunk/blender -r43009:43033
[blender.git] / source / creator / CMakeLists.txt
index ac21bf5b21f656df92b9356f314fc119917bc6a8..65df7ed73210017d1b143f60fabccd88de7bf4a5 100644 (file)
@@ -437,15 +437,15 @@ elseif(WIN32)
        # )
 
        if(WITH_PYTHON)
-
+               set_lib_path(PYLIB "python/lib")
                install(
-                       FILES ${LIBDIR}/python/lib/python32.dll
+                       FILES ${PYLIB}/python32.dll
                        DESTINATION ${TARGETDIR}
                        CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
                )
 
                install(
-                       FILES ${LIBDIR}/python/lib/python32_d.dll
+                       FILES ${PYLIB}/python32_d.dll
                        DESTINATION ${TARGETDIR}
                        CONFIGURATIONS Debug
                )
@@ -558,9 +558,10 @@ elseif(WIN32)
        )       
 
        if(WITH_OPENIMAGEIO)
+               set_lib_path(OIIOBIN "openimageio/bin")
                install(
                        FILES
-                               ${LIBDIR}/openimageio/bin/OpenImageIO.dll
+                               ${OIIOBIN}/OpenImageIO.dll
                        DESTINATION ${TARGETDIR}
                )
        endif()
@@ -822,6 +823,7 @@ endif()
                bf_blenfont
                bf_intern_audaspace
                bf_intern_mikktspace
+               bf_intern_dualcon
                bf_intern_cycles
                cycles_render
                cycles_bvh