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

(svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG

Browse Source
This commit is contained in:
peter1138
2006-03-31 21:06:55 +00:00
parent ab1ecd7704
commit 92c4d26a26
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefiledir/Makefile.config_writer
View File

@@ -92,8 +92,8 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,)
$(call CONFIG_LINE,\# misc)
$(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG))
$(call CONFIG_LINE,LIBPNG-CONFIG:=$(LIBPNG-CONFIG))
$(call CONFIG_LINE,SDL_CONFIG:=$(SDL_CONFIG))
$(call CONFIG_LINE,LIBPNG_CONFIG:=$(LIBPNG_CONFIG))
$(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER))
$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)
$(call CONFIG_LINE,PATH_SET:=$(PATH_SET))

10
makefiledir/Makefile.libdetection
View File

@@ -63,22 +63,22 @@ endif
# FreeBSD uses sdl11 instead of sdl
ifdef FREEBSD
SDL-CONFIG:=sdl11-config
SDL_CONFIG:=sdl11-config
else
SDL-CONFIG:=sdl-config
SDL_CONFIG:=sdl-config
endif
# set libpng-config to the default value
LIBPNG-CONFIG :=libpng-config
LIBPNG_CONFIG :=libpng-config
# Networking, enabled by default
WITH_NETWORK:=1
# Library detections
WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
WITH_SDL:=$(shell $(SDL_CONFIG) --version 2>/dev/null)
# libpng detection
WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null)
WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null)
ifdef WITH_PNG
# LibPNG depends on Zlib