summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-12-10 13:00:11 +0000
committerbjarni <bjarni@openttd.org>2004-12-10 13:00:11 +0000
commitc669c94ba397800f40638d04d445ff9f3c226b7b (patch)
tree08016630eee71be52e1ed6602cfa81d58cd74227
parent625332a6861ca74e4f10110d49fdc09bb4487cdc (diff)
downloadopenttd-c669c94ba397800f40638d04d445ff9f3c226b7b.tar.xz
(svn r1003) Mac: reintroduced the static libpng hack in makefile since it appears to be needed in the nightly builds
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 79e045ef6..ed707de4e 100644
--- a/Makefile
+++ b/Makefile
@@ -425,7 +425,12 @@ CFLAGS += `libpng-config --cflags`
# seems like older libpng versions are broken and need this
PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC
+ifdef OSX
+# Seems like we need a tiny hack for OSX static to work
+LIBS += `libpng-config --prefix`/lib/libpng.a
+else
LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)`
+endif
else
LIBS += `libpng-config --L_opts $(PNGCONFIG_FLAGS)`
endif