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

(svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all

release/0.5
bjarni 2006-03-31 10:04:18 +00:00
parent 20c29f10df
commit 3b4b577107
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -416,8 +416,17 @@ endif
# zlib config # zlib config
ifdef WITH_ZLIB ifdef WITH_ZLIB
CDEFS += -DWITH_ZLIB CDEFS += -DWITH_ZLIB
LIBS += -lz ifdef STATIC
ifdef OSX
# OSX links dynamically to zlib, even in static builds since it's always present in the system
LIBS += -lz
else
LIBS += $(STATIC_ZLIB_PATH)
endif
else
LIBS += -lz
endif
endif endif
# libpng config # libpng config

1
makefiledir/Makefile.config_writer
View File

@ -67,6 +67,7 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB)) $(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL)) $(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG)) $(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG))
$(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA)) $(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
$(call CONFIG_LINE,) $(call CONFIG_LINE,)

20
makefiledir/Makefile.libdetection
View File

@ -81,8 +81,8 @@ WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null) WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null)
ifdef WITH_PNG ifdef WITH_PNG
# LibPNG depends on Zlib # LibPNG depends on Zlib
WITH_ZLIB:=1 WITH_ZLIB:=1
else else
# We go looking for zlib with a little hack # We go looking for zlib with a little hack
WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \ WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
@ -92,6 +92,22 @@ WITH_ZLIB:=1
endif endif
endif endif
ifdef WITH_ZLIB
TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
ifdef TEMP
STATIC_ZLIB_PATH:=/lib/$(TEMP)
else
TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
ifdef TEMP
STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
else
TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
ifdef TEMP
STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
endif
endif
endif
endif
# sets the default paths # sets the default paths
ifdef UNIX ifdef UNIX