cpp/openttd-patchpack/source Changeset - r20600:cc279241ab07

Changeset - r20600:cc279241ab07

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

planetmaker - 11 years ago 2013-07-30 22:03:36
planetmaker@openttd.org

(svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one

3 files changed with 4 insertions and 4 deletions:

bin/baseset/no_music.obm

bin/baseset/no_sound.obs

config.lib

0 comments (0 inline, 0 general)

bin/baseset/no_music.obm

➞

Show inline comments

 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.

bin/baseset/no_sound.obs

➞

Show inline comments

 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.

config.lib

➞

Show inline comments

@@ @@ -1718,9 +1718,9 @@ make_cflags_and_ldflags() { @@
 		# 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

0 comments (0 inline, 0 general)