Changeset - r6244:17cd59ad569e
[Not reviewed]
master
0 1 0
truelight - 18 years ago 2007-03-06 22:55:18
truelight@openttd.org
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
1 file changed with 2 insertions and 1 deletions:
0 comments (0 inline, 0 general)
config.lib
Show inline comments
 
@@ -790,13 +790,14 @@ make_cflags_and_ldflags() {
 
		CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
 
		CFLAGS="$CFLAGS `$fontconfig_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
 
				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a"
 
				# 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 `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`"
 
			else
 
				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 
			fi
 
		else
 
			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
 
		fi
0 comments (0 inline, 0 general)