mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2328) There's no need for extra magic to detect libpng on FreeBSD

release/0.4.5
tron 2005-05-16 08:30:32 +00:00
parent 2bc9764fcf
commit ff52fc8267
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -457,10 +457,6 @@ endif
# libpng config # libpng config
ifdef WITH_PNG ifdef WITH_PNG
CDEFS += -DWITH_PNG CDEFS += -DWITH_PNG
# FreeBSD doesn't use libpng-config
ifdef FREEBSD
LIBS += -lpng
else
CFLAGS += $(shell libpng-config --cflags) CFLAGS += $(shell libpng-config --cflags)
# seems like older libpng versions are broken and need this # seems like older libpng versions are broken and need this
@ -476,7 +472,6 @@ else
LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS)) LIBS += $(shell libpng-config --L_opts $(PNGCONFIG_FLAGS))
endif endif
endif endif
endif
# enables/disables assert() # enables/disables assert()
ifdef DISABLE_ASSERTS ifdef DISABLE_ASSERTS

10
makefiledir/Makefile.libdetection
View File

@ -66,17 +66,7 @@ WITH_NETWORK:=1
WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null) WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
# libpng detection # 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) WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
endif
ifdef WITH_PNG ifdef WITH_PNG
# LibPNG depends on Zlib # LibPNG depends on Zlib