Mercurial > hg > openttd
changeset 20724:329dd9fe332d draft
(svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one
| author | planetmaker <planetmaker@openttd.org> |
|---|---|
| date | Tue, 30 Jul 2013 22:03:36 +0000 |
| parents | 85c60e19b96a |
| children | fec842671605 |
| files | bin/baseset/no_music.obm bin/baseset/no_sound.obs config.lib |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/baseset/no_music.obm +++ b/bin/baseset/no_music.obm @@ -21,7 +21,7 @@ description.en_AU = A music pack without actual music. description.en_US = A music pack without actual music. description.es_ES = Un conjunto de música vacío. -description.et_EE = Muusikakomplekt ilma igasuguse muusikata. +description.et_EE = Muusikakogu ilma muusikata. description.fi_FI = Musiikkipaketti, jossa ei ole musiikkia. description.fr_FR = Un pack de musiques sans musiques. description.gd_GB = Pacaid ciùil anns nach eil fonn sam bith.
--- a/bin/baseset/no_sound.obs +++ b/bin/baseset/no_sound.obs @@ -21,7 +21,7 @@ description.en_AU = A sound pack without any sounds. description.en_US = A sound pack without any sounds. description.es_ES = Un conjunto de sonidos vacío. -description.et_EE = Ilma häälteta helipakk. +description.et_EE = Helikogu ilma helideta. description.fi_FI = Äänipaketti, jossa ei ole ääniä. description.fr_FR = Un pack de sons sans sons. description.gd_GB = Pacaid fhuaimean anns nach eil fuaim sam bith.
--- a/config.lib +++ b/config.lib @@ -1718,9 +1718,9 @@ # Some icu-configs have the 'feature' of not adding a space where others do add the space if [ "$static_icu" != "0" ]; then - LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly --ldflags-layout | tr '\n\r' ' ' | sed s/licu/lsicu/g`" + LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly` `$icu_config --ldflags-layout | tr '\n\r' ' ' | sed s/licu/lsicu/g`" else - LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly --ldflags-layout | tr '\n\r' ' '`" + LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly` `$icu_config --ldflags-layout | tr '\n\r' ' '`" fi fi