forked from bartvdbraak/blender
Update build rules to deal with new gettext libraries.
This commit is contained in:
parent
761c44cbc1
commit
86d05b3144
@ -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)
|
||||
|
@ -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']
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user