summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-12-04 23:19:31 +0000
committerbjarni <bjarni@openttd.org>2004-12-04 23:19:31 +0000
commit14a025a6bfc7254371b949ba2f9af70407292996 (patch)
treed23a64e758ae9fbe2c81aaf244a40b0ae4c196a8
parente7ee76dc562b73df0532844dad451ddce331e004 (diff)
downloadopenttd-14a025a6bfc7254371b949ba2f9af70407292996.tar.xz
(svn r951) Makefile: fixed missing flag for libpng, which prevented lib detection if SDL was not used
Makefile: Combined the OSX specific libpng code with the general one. Now OSX have no special code for libpng
-rw-r--r--Makefile18
1 files changed, 2 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index ec75285dc..8541f026e 100644
--- a/Makefile
+++ b/Makefile
@@ -214,12 +214,6 @@ endif
endif
endif
-# For some reason it will not link with libpng if SDL is disabled
-# this automatically disables libpng if no SDL is found
-ifndef WITH_SDL
-WITH_PNG:=
-endif
-
##############################################################################
@@ -415,21 +409,13 @@ ifdef FREEBSD
LIBS += -lpng
else
CFLAGS += `libpng-config --cflags`
-ifdef OSX
-ifdef STATIC
-# Seems like we need a tiny hack for OSX static to work
-LIBS += `libpng-config --prefix`/lib/libpng.a
-else
-LIBS += `libpng-config --libs`
-endif
-else
+
# seems like older libpng versions are broken and need this
PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC
LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)`
else
-LIBS += `libpng-config $(PNGCONFIG_FLAGS)`
-endif
+LIBS += `libpng-config --L_opts $(PNGCONFIG_FLAGS)`
endif
endif
endif