Changeset - r1823:d59f75c8dc44
[Not reviewed]
master
0 2 0
tron - 19 years ago 2005-05-16 08:30:32
tron@openttd.org
(svn r2328) There's no need for extra magic to detect libpng on FreeBSD
2 files changed with 0 insertions and 15 deletions:
0 comments (0 inline, 0 general)
Makefile
Show inline comments
 
@@ -457,10 +457,6 @@ endif
 
# libpng config
 
ifdef WITH_PNG
 
CDEFS += -DWITH_PNG
 
# FreeBSD doesn't use libpng-config
 
ifdef FREEBSD
 
LIBS += -lpng
 
else
 
CFLAGS += $(shell libpng-config --cflags)
 

	
 
# seems like older libpng versions are broken and need this
 
@@ -476,7 +472,6 @@ else
 
LIBS += $(shell libpng-config  --L_opts $(PNGCONFIG_FLAGS))
 
endif
 
endif
 
endif
 

	
 
# enables/disables assert()
 
ifdef DISABLE_ASSERTS
makefiledir/Makefile.libdetection
Show inline comments
 
@@ -66,17 +66,7 @@ WITH_NETWORK:=1
 
WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
 

	
 
# libpng detection
 
ifdef FREEBSD
 
# a little hack was needed for FreeBSD because it misses libpng-config
 
WITH_PNG:=$(shell ls /usr/lib | grep "libpng" 2>/dev/null) $(shell \
 
ls /usr/local/lib | grep "libpng" 2>/dev/null)
 
ifdef WITH_PNG
 
# makes the flag look nicer in makefile.config
 
WITH_PNG:=1
 
endif
 
else
 
WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
 
endif
 

	
 
ifdef WITH_PNG
 
# LibPNG depends on Zlib
0 comments (0 inline, 0 general)