gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 02:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18147) -Add: experimental option to try to statically link to libicu

Browse Source
This commit is contained in:
rubidium 2009-11-17 18:01:05 +00:00
parent 00f0dfd00d
commit c6e13c6c0a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.lib
View File

@ -78,6 +78,7 @@ set_default() {
with_freetype="1" with_freetype="1"
with_fontconfig="1" with_fontconfig="1"
with_icu="1" with_icu="1"
static_icu="0"
with_psp_config="1" with_psp_config="1"
with_threads="1" with_threads="1"
with_distcc="1" with_distcc="1"
@ -145,6 +146,7 @@ set_default() {
with_freetype with_freetype
with_fontconfig with_fontconfig
with_icu with_icu
static_icu
with_psp_config with_psp_config
with_threads with_threads
with_distcc with_distcc
@ -342,6 +344,10 @@ detect_params() {
--with-libicu) with_icu="2";; --with-libicu) with_icu="2";;
--without-libicu) with_icu="0";; --without-libicu) with_icu="0";;
--with-libicu=*) with_icu="$optarg";; --with-libicu=*) with_icu="$optarg";;
--static-icu) static_icu="1";;
--static-icu=*) static_icu="$optarg";;
--static-libicu) static_icu="1";;
--static-libicu=*) static_icu="$optarg";;
--with-psp-config) with_psp_config="2";; --with-psp-config) with_psp_config="2";;
--without-psp-config) with_psp_config="0";; --without-psp-config) with_psp_config="0";;
@ -1400,7 +1406,11 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' ' '`" CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' ' '`"
# Some icu-configs have the 'feature' of not adding a space where others do add the space # Some icu-configs have the 'feature' of not adding a space where others do add the space
LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' ' '`" if [ "$static_icu" != "0" ]; then
LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' ' ' | sed s/licu/lsicu/g`"
else
LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' ' '`"
fi
fi fi
@ -3063,6 +3073,8 @@ showhelp() {
echo " --with-fontconfig[=pkg-config fontconfig]" echo " --with-fontconfig[=pkg-config fontconfig]"
echo " enables fontconfig support" echo " enables fontconfig support"
echo " --with-icu[=icu-config] enables icu (used for right-to-left support)" echo " --with-icu[=icu-config] enables icu (used for right-to-left support)"
echo " --static-icu try to link statically (libsicu instead of"
echo " libicu; can fail as the new name is guessed)"
echo " --with-iconv[=iconv-path] enables iconv support" echo " --with-iconv[=iconv-path] enables iconv support"
echo " --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)" echo " --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
echo " --disable-builtin-depend disable use of builtin deps finder" echo " --disable-builtin-depend disable use of builtin deps finder"