mirror of https://github.com/OpenTTD/OpenTTD
(svn r26435) -Fix (r26434): linking issue on OS X
parent
baf0077a84
commit
f24d941da1
|
@ -1706,7 +1706,7 @@ make_cflags_and_ldflags() {
|
||||||
if [ "$os" = "OSX" ]; then
|
if [ "$os" = "OSX" ]; then
|
||||||
# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
|
# 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
|
# 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
|
else
|
||||||
LIBS="$LIBS `$png_config --libs --static | tr '\n\r' ' '`"
|
LIBS="$LIBS `$png_config --libs --static | tr '\n\r' ' '`"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue