dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r951) Makefile: fixed missing flag for libpng, which prevented lib detection if SDL was not used

Browse Source 
Makefile: Combined the OSX specific libpng code with the general one. Now OSX have no special code for libpng
This commit is contained in:
bjarni
2004-12-04 23:19:31 +00:00
parent edb26fb40e
commit 5069e98221
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@@ -214,12 +214,6 @@ endif
endif 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 LIBS += -lpng
else else
CFLAGS += `libpng-config --cflags` 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 # seems like older libpng versions are broken and need this
PNGCONFIG_FLAGS = --ldflags --libs PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC ifdef STATIC
LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)` LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)`
else else
LIBS += `libpng-config $(PNGCONFIG_FLAGS)` LIBS += `libpng-config --L_opts $(PNGCONFIG_FLAGS)`
endif
endif endif
endif endif
endif endif