summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-03-31 21:06:55 +0000
committerpeter1138 <peter1138@openttd.org>2006-03-31 21:06:55 +0000
commit45a0557b37cdf8e25655df59845198825a8fbb8d (patch)
tree2602ec883ba4ff050a9eb63b9f00809a2e01b8f3
parentca0c73e4ead08a8f8d3c7e82f4241a008e3de252 (diff)
downloadopenttd-45a0557b37cdf8e25655df59845198825a8fbb8d.tar.xz
(svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG
-rw-r--r--Makefile22
-rwxr-xr-xconfigure8
-rw-r--r--makefiledir/Makefile.config_writer4
-rw-r--r--makefiledir/Makefile.libdetection10
4 files changed, 22 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 04f0b67b5..060677f25 100644
--- a/Makefile
+++ b/Makefile
@@ -224,14 +224,14 @@ ifdef OSX
endif
ifdef WITH_SDL
- ifndef SDL-CONFIG
-$(error WITH_SDL can't be used when SDL-CONFIG is not set. Edit Makefile.config to correct this)
+ ifndef SDL_CONFIG
+$(error WITH_SDL can't be used when SDL_CONFIG is not set. Edit Makefile.config to correct this)
endif
endif
ifdef WITH_PNG
- ifndef LIBPNG-CONFIG
-$(error WITH_PNG can't be used when LIBPNG-CONFIG is not set. Edit Makefile.config to correct this)
+ ifndef LIBPNG_CONFIG
+$(error WITH_PNG can't be used when LIBPNG_CONFIG is not set. Edit Makefile.config to correct this)
endif
endif
@@ -406,11 +406,11 @@ endif
# SDL config
ifdef WITH_SDL
CDEFS += -DWITH_SDL
-CFLAGS += $(shell $(SDL-CONFIG) --cflags)
+CFLAGS += $(shell $(SDL_CONFIG) --cflags)
ifdef STATIC
-LIBS += $(shell $(SDL-CONFIG) --static-libs)
+LIBS += $(shell $(SDL_CONFIG) --static-libs)
else
-LIBS += $(shell $(SDL-CONFIG) --libs)
+LIBS += $(shell $(SDL_CONFIG) --libs)
endif
endif
@@ -432,19 +432,19 @@ endif
# libpng config
ifdef WITH_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
PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC
ifdef OSX
# 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
-LIBS += $(shell $(LIBPNG-CONFIG) --static $(PNGCONFIG_FLAGS))
+LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS))
endif
else
-LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS))
+LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
endif
endif
diff --git a/configure b/configure
index 760bbf46d..a8556c9a0 100755
--- a/configure
+++ b/configure
@@ -162,16 +162,16 @@ do
ITEM="STATIC_ZLIB_PATH"
;;
--sdl-config=*)
- handle SDL-CONFIG "$n"
+ handle SDL_CONFIG "$n"
;;
--sdl-config)
- ITEM="SDL-CONFIG"
+ ITEM="SDL_CONFIG"
;;
--libpng-config=*)
- handle LIBPNG-CONFIG "$n"
+ handle LIBPNG_CONFIG "$n"
;;
--lib-png-config)
- ITEM="LIBPNG-CONFIG"
+ ITEM="LIBPNG_CONFIG"
;;
--*=*)
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index a305c89d0..7caff27d7 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -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))
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index ade09c076..7139fd5cf 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -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