[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40221] trunk/blender: Update build rules to deal with new gettext libraries.

[Sergey Sharybin]

Revision: 40221
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40221
Author:   nazgul
Date:     2011-09-15 11:37:42 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Update build rules to deal with new gettext libraries.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-09-15 11:34:33 UTC (rev 40220)
+++ trunk/blender/CMakeLists.txt	2011-09-15 11:37:42 UTC (rev 40221)
@@ -642,11 +642,7 @@
 			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INC ${GETTEXT}/include)
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
-			if(CMAKE_CL_64)
-				set(GETTEXT_LIB gettext)
-			else()
-				set(GETTEXT_LIB gnu_gettext)
-			endif()
+			set(GETTEXT_LIB gnu_gettext)
 		endif()
 
 		if(CMAKE_CL_64)

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-09-15 11:34:33 UTC (rev 40220)
+++ trunk/blender/SConstruct	2011-09-15 11:37:42 UTC (rev 40221)
@@ -645,7 +645,7 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
     dllsources = []
 
-    if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+    if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
         # For MinGW and linuxcross static linking will be used
         dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
 

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2011-09-15 11:34:33 UTC (rev 40220)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2011-09-15 11:37:42 UTC (rev 40221)
@@ -100,7 +100,7 @@
 
 BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettext'
+BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_GAMEENGINE = True

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-09-15 11:34:33 UTC (rev 40220)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-09-15 11:37:42 UTC (rev 40221)
@@ -435,17 +435,17 @@
 			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}
+		)
 
-			install(
-				FILES ${LIBDIR}/iconv/lib/iconv.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
+               if(NOT CMAKE_CL_64)
+                       install(
+                               FILES ${LIBDIR}/iconv/lib/iconv.dll
+                               DESTINATION ${TARGETDIR}
+                       )
+               endif()
 	endif()
 
 	install( # same as linux!, deduplicate