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 ca0c73e4ea
commit 45a0557b37
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@@ -224,14 +224,14 @@ ifdef OSX
endif endif
ifdef WITH_SDL ifdef WITH_SDL
ifndef SDL-CONFIG ifndef SDL_CONFIG
$(error WITH_SDL can't be used when SDL-CONFIG is not set. Edit Makefile.config to correct this) $(error WITH_SDL can't be used when SDL_CONFIG is not set. Edit Makefile.config to correct this)
endif endif
endif endif
ifdef WITH_PNG ifdef WITH_PNG
ifndef LIBPNG-CONFIG ifndef LIBPNG_CONFIG
$(error WITH_PNG can't be used when LIBPNG-CONFIG is not set. Edit Makefile.config to correct this) $(error WITH_PNG can't be used when LIBPNG_CONFIG is not set. Edit Makefile.config to correct this)
endif endif
endif endif
@@ -406,11 +406,11 @@ endif
# SDL config # SDL config
ifdef WITH_SDL ifdef WITH_SDL
CDEFS += -DWITH_SDL CDEFS += -DWITH_SDL
CFLAGS += $(shell $(SDL-CONFIG) --cflags) CFLAGS += $(shell $(SDL_CONFIG) --cflags)
ifdef STATIC ifdef STATIC
LIBS += $(shell $(SDL-CONFIG) --static-libs) LIBS += $(shell $(SDL_CONFIG) --static-libs)
else else
LIBS += $(shell $(SDL-CONFIG) --libs) LIBS += $(shell $(SDL_CONFIG) --libs)
endif endif
endif endif
@@ -432,19 +432,19 @@ endif
# libpng config # libpng config
ifdef WITH_PNG ifdef WITH_PNG
CDEFS += -DWITH_PNG CDEFS += -DWITH_PNG
CFLAGS += $(shell $(LIBPNG-CONFIG) --cppflags --I_opts) CFLAGS += $(shell $(LIBPNG_CONFIG) --cppflags --I_opts)
# 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
ifdef OSX ifdef OSX
# Seems like we need a tiny hack for OSX static to work # Seems like we need a tiny hack for OSX static to work
LIBS += $(shell $(LIBPNG-CONFIG) --prefix)/lib/libpng.a LIBS += $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a
else else
LIBS += $(shell $(LIBPNG-CONFIG) --static $(PNGCONFIG_FLAGS)) LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS))
endif endif
else else
LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
endif endif
endif endif

8
configure vendored
View File

@@ -162,16 +162,16 @@ do
ITEM="STATIC_ZLIB_PATH" ITEM="STATIC_ZLIB_PATH"
;; ;;
--sdl-config=*) --sdl-config=*)
handle SDL-CONFIG "$n" handle SDL_CONFIG "$n"
;; ;;
--sdl-config) --sdl-config)
ITEM="SDL-CONFIG" ITEM="SDL_CONFIG"
;; ;;
--libpng-config=*) --libpng-config=*)
handle LIBPNG-CONFIG "$n" handle LIBPNG_CONFIG "$n"
;; ;;
--lib-png-config) --lib-png-config)
ITEM="LIBPNG-CONFIG" ITEM="LIBPNG_CONFIG"
;; ;;
--*=*) --*=*)

4
makefiledir/Makefile.config_writer
View File

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

10
makefiledir/Makefile.libdetection
View File

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