Update build rules to deal with new gettext libraries.
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Sep 2011 11:37:42 +0000 (11:37 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Sep 2011 11:37:42 +0000 (11:37 +0000)
CMakeLists.txt
SConstruct
build_files/scons/config/win64-vc-config.py
source/creator/CMakeLists.txt

index 6eb8b8c0853b4e34a77abd6a1503224f551041ee..d6e6bf06f3161674a8868ac32160da101820b1c6 100644 (file)
@@ -642,11 +642,7 @@ elseif(WIN32)
                        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)
index 2531872af6c6de85647ae1ee8d55ab720ebe7b59..06e6fe3473d5adb1cede2cff0b7a2deab5a188f4 100644 (file)
@@ -645,7 +645,7 @@ else:
 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']
 
index ba9633a6b4c4f71646ae0efb881dda35b5021f6c..3e22e9a634f4717691e86a4b1227a71d8d78ba26 100644 (file)
@@ -100,7 +100,7 @@ WITH_BF_INTERNATIONAL = False
 
 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
index b48915ce7088547cc3ac14aef53a0aaf2fe3fcb5..581e4c4d1ce69103fff707617441e4acc3e3bda9 100644 (file)
@@ -435,17 +435,17 @@ 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}
+               )
 
-                       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