svn merge ^/trunk/blender -r40720:40872

1 files changed, 15 insertions, 29 deletions

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e11b4f5562f..70e90164e81 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -125,7 +125,7 @@ if(WIN32 AND NOT UNIX)
 			-DBLEN_VER_RC_4=0
 		)
 	endif()
-	
+
 
 	list(APPEND SRC
 		../icons/winblender.rc
@@ -198,16 +198,16 @@ if(WITH_PYTHON_MODULE)
 			LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
 	)
-	
+
 	if(WIN32)
 		# python modules use this
 		set_target_properties(
 			blender
 			PROPERTIES
 			SUFFIX ".pyd"
-		)	
+		)
 	endif()
-	
+
 else()
 	add_executable(blender ${EXETYPE} ${SRC})
 endif()
@@ -351,11 +351,6 @@ if(UNIX AND NOT APPLE)
 
 	if(WITH_INTERNATIONAL)
 		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
-			DESTINATION ${TARGETDIR_VER}
-		)
-
-		install(
 			DIRECTORY
 				${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
 				${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
@@ -428,10 +423,6 @@ elseif(WIN32)
 
 	if(WITH_INTERNATIONAL) # same as linux!, deduplicate
 		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
-			DESTINATION ${TARGETDIR_VER}
-		)
-		install(
 			DIRECTORY
 				${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
 				${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
@@ -591,12 +582,12 @@ elseif(WIN32)
 			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
 			DESTINATION ${TARGETDIR}
 		)
-	else()
-		install(
-			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
-			DESTINATION ${TARGETDIR}
-		)
 	endif()
+		
+	install( # x86 builds can run on x64 Windows, so this is required at all times
+		FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
+		DESTINATION ${TARGETDIR}
+	)	
 
 elseif(APPLE)
 	set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
@@ -664,11 +655,6 @@ elseif(APPLE)
 	# localization
 	if(WITH_INTERNATIONAL)
 		install(
-			FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
-			DESTINATION ${TARGETDIR_VER}/datafiles
-		)
-
-		install(
 			DIRECTORY
 				${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
 				${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
@@ -687,14 +673,14 @@ elseif(APPLE)
 			DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python)
 
 		set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
-			
+
 		add_custom_command(
 			OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
 			COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
 			COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
 			COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
 			DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-		
+
 		add_dependencies(blender extractpyzip)
 
 		# copy extracted python files
@@ -728,7 +714,7 @@ elseif(APPLE)
 			FILES ${PLAYER_SOURCEDIR}/Contents/PkgInfo
 			DESTINATION ${TARGETDIR}/blenderplayer.app/Contents
 		)
-	
+
 		install_dir(
 			${PLAYER_SOURCEDIR}/Contents/Resources
 			\${TARGETDIR}/blenderplayer.app/Contents/
@@ -742,7 +728,7 @@ elseif(APPLE)
 				COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
 				COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
 				DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
-	
+
 			# copy extracted python files
 			install_dir(
 				${CMAKE_CURRENT_BINARY_DIR}/python
@@ -918,12 +904,12 @@ endif()
 		message(STATUS "Blender Skipping: (${REM_MSG})")
 	endif()
 	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
-	
+
 	unset(SEARCHLIB)
 	unset(SORTLIB)
 	unset(REMLIB)
 	unset(REM_MSG)
-	
+
 #else()
 #	target_link_libraries(blender ${BLENDER_LINK_LIBS})
 #endif()