diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-15 15:37:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-15 15:37:42 +0400 |
| commit | 86d05b31446d8960679ece640089474afe5577d9 (patch) | |
| tree | 2bc24d4a7d9086fb80d039b9f1297dd620645ac0 | |
| parent | 761c44cbc1274a023fdb89cf5a4cbd4100684cd3 (diff) | |
Update build rules to deal with new gettext libraries.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 20 |
4 files changed, 13 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6eb8b8c0853..d6e6bf06f31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/SConstruct b/SConstruct index 2531872af6c..06e6fe3473d 100644 --- a/SConstruct +++ b/SConstruct @@ -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'] diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index ba9633a6b4c..3e22e9a634f 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -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 diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b48915ce708..581e4c4d1ce 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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 |