Merged changes in the trunk up to revision 49797.

source/creator/CMakeLists.txt

@@ -476,15 +476,15 @@ elseif(WIN32)
 	endif()
 
 	if(WITH_PYTHON)
-		set_lib_path(PYLIB "python/lib")
+		set_lib_path(PYLIB "python")
 		install(
-			FILES ${PYLIB}/python32.dll
+			FILES ${PYLIB}/lib/python32.dll
 			DESTINATION ${TARGETDIR}
 			CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
 		)
 
 		install(
-			FILES ${PYLIB}/python32_d.dll
+			FILES ${PYLIB}/lib/python32_d.dll
 			DESTINATION ${TARGETDIR}
 			CONFIGURATIONS Debug
 		)
@@ -628,10 +628,10 @@ elseif(WIN32)
 
 	if(WITH_OPENIMAGEIO)
 		if(NOT MINGW)
-			set_lib_path(OIIOBIN "openimageio/bin")
+			set_lib_path(OIIOBIN "openimageio")
 			install(
 				FILES
-					${OIIOBIN}/OpenImageIO.dll
+					${OIIOBIN}/bin/OpenImageIO.dll
 				DESTINATION ${TARGETDIR}
 			)
 		endif()
@@ -862,7 +862,6 @@ endif()
 		bf_imbuf_dds
 		bf_collada
 		bf_intern_bsp
-		bf_intern_bop
 		bf_intern_decimate
 		bf_intern_elbeem
 		bf_intern_ik
@@ -945,7 +944,7 @@ endif()
 		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
 	endif()
 
-	if(WITH_CARVE)
+	if(WITH_MOD_BOOLEAN)
 		list(APPEND BLENDER_SORTED_LIBS extern_carve)
 	endif()