Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update build rules to deal with new gettext libraries.

Browse Source
This commit is contained in:
Sergey Sharybin
2011-09-15 11:37:42 +00:00
parent 761c44cbc1
commit 86d05b3144
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -642,11 +642,7 @@ elseif(WIN32)
set(GETTEXT ${LIBDIR}/gettext) set(GETTEXT ${LIBDIR}/gettext)
set(GETTEXT_INC ${GETTEXT}/include) set(GETTEXT_INC ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib) set(GETTEXT_LIBPATH ${GETTEXT}/lib)
if(CMAKE_CL_64) set(GETTEXT_LIB gnu_gettext)
set(GETTEXT_LIB gettext)
else()
set(GETTEXT_LIB gnu_gettext)
endif()
endif() endif()
if(CMAKE_CL_64) if(CMAKE_CL_64)

2
SConstruct
View File

@@ -645,7 +645,7 @@ else:
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = [] 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 # For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll'] dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']

2
build_files/scons/config/win64-vc-config.py
View File

@@ -100,7 +100,7 @@ WITH_BF_INTERNATIONAL = False
BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT = LIBDIR + '/gettext'
BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_INC = '${BF_GETTEXT}/include'
BF_GETTEXT_LIB = 'gettext' BF_GETTEXT_LIB = 'gnu_gettext'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = True WITH_BF_GAMEENGINE = True

20
source/creator/CMakeLists.txt
View File

@@ -435,17 +435,17 @@ elseif(WIN32)
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
if(NOT CMAKE_CL_64) install(
install( FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll DESTINATION ${TARGETDIR}
DESTINATION ${TARGETDIR} )
)
install( if(NOT CMAKE_CL_64)
FILES ${LIBDIR}/iconv/lib/iconv.dll install(
DESTINATION ${TARGETDIR} FILES ${LIBDIR}/iconv/lib/iconv.dll
) DESTINATION ${TARGETDIR}
endif() )
endif()
endif() endif()
install( # same as linux!, deduplicate install( # same as linux!, deduplicate