cpp/openttd-patchpack/source Changeset - r21340:16510f1064fe

Changeset - r21340:16510f1064fe

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 11 years ago 2014-03-28 19:18:36
rubidium@openttd.org

(svn r26435) -Fix (r26434): linking issue on OS X

1 file changed with 1 insertions and 1 deletions:

config.lib

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1703,13 +1703,13 @@ make_cflags_and_ldflags() { @@
 		CFLAGS="$CFLAGS `$png_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
 			if [ "$os" = "OSX" ]; then
 				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
 				LIBS="$LIBS `$png_config --variable=prefix`/lib/libpng.a `$png_config --libs --static | sed s@-lpng@@`"
+				LIBS="$LIBS `$png_config --variable=prefix`/lib/libpng.a `$png_config --libs --static | sed s@-lpng[0-9]*@@`"
 			else
 				LIBS="$LIBS `$png_config --libs --static | tr '\n\r' '  '`"
 			fi
 		else
 			LIBS="$LIBS `$png_config --libs | tr '\n\r' '  '`"
 		fi

0 comments (0 inline, 0 general)