cpp/openttd-patchpack/source Changeset - r6035:172ee15a26d5

Changeset - r6035:172ee15a26d5

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

truelight - 18 years ago 2007-02-16 10:08:38
truelight@openttd.org

(svn r8758) -Fix r8757: wrong variable to check libtimidity on if it is found or not

2 files changed with 2 insertions and 2 deletions:

config.lib

configure

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -773,25 +773,25 @@ make_cflags_and_ldflags() { @@
 			else
 				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 			fi
 		else
 			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
 		fi
 	fi
 	if [ "$with_direct_music" != "0" ]; then
 		CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
 	fi
-	if [ "$with_libtimidity" != "0" ]; then
+	if [ -n "$libtimidity" ]; then
 		if [ "$enable_static" != "0" ]; then
 			LIBS="$LIBS $libtimidity"
 		else
 			LIBS="$LIBS -ltimidity"
 		fi
 		CFLAGS="$CFLAGS -DLIBTIMIDITY"
 	fi
 	if [ "$with_iconv" != "0" ]; then
 		CFLAGS="$CFLAGS -DWITH_ICONV"
 		LIBS="$LIBS -liconv"
 		if [ "$with_iconv" != "2" ]; then

configure

➞

Show inline comments

@@ @@ -73,25 +73,25 @@ SRCS="`< $ROOT_DIR/source.list tr '\r' ' @@
 		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
 		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 		if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
 		if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
-		if ($0 == "LIBTIMIDITY" && "'$with_libtimidity'" == "0")   { next; }
+		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 		skip += 1;
 		next;
+	}
 	/^(	*)#/ { next }
 	/^$/ { next }
 	/\.h$/ { next }
 	/\.hpp$/ { next }
+	{
 		if (deep == skip) {
 			gsub("	", "", $0);

0 comments (0 inline, 0 general)