cpp/openttd-patchpack/source Changeset - r22196:ce6ed58f5bdf

Changeset - r22196:ce6ed58f5bdf

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 9 years ago 2015-08-09 12:43:52
rubidium@openttd.org

(svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config

1 file changed with 9 insertions and 6 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1760,13 +1760,15 @@ make_cflags_and_ldflags() { @@
 		fi
 	fi
 	if [ -n "$libtimidity" ]; then
 	if [ -n "$libtimidity_config" ]; then
 		CFLAGS="$CFLAGS -DLIBTIMIDITY"
 		CFLAGS="$CFLAGS `$libtimidity_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
-			LIBS="$LIBS $libtimidity"
+			LIBS="$LIBS `$libtimidity_config --libs --static | tr '\n\r' '  '`"
 		else
-			LIBS="$LIBS -ltimidity"
+			LIBS="$LIBS `$libtimidity_config --libs | tr '\n\r' '  '`"
 		fi
 		CFLAGS="$CFLAGS -DLIBTIMIDITY"
 	fi
 	if [ "$with_iconv" != "0" ]; then
@@ @@ -2669,7 +2671,7 @@ detect_lzo2() { @@
+}
 detect_libtimidity() {
-	detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h"
+	detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
+}
 detect_pkg_config() {
@@ @@ -3533,7 +3535,8 @@ showhelp() { @@
 	echo "  --with-midi=midi               define which midi-player to use"
 	echo "  --with-midi-arg=arg            define which args to use for the"
 	echo "                                 midi-player"
 	echo "  --with-libtimidity             enables libtimidity support"
 	echo "  --with-libtimidity[=\"pkg-config libtimidity\"]"
 	echo "                                 enables libtimidity support"
 	echo "  --with-allegro[=\"pkg-config allegro\"]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"

0 comments (0 inline, 0 general)