summaryrefslogtreecommitdiff
path: root/makefiledir
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-03-30 20:14:06 +0000
committerbjarni <bjarni@openttd.org>2006-03-30 20:14:06 +0000
commit1a56b830c09db377afad0793f5e07866c2c5c895 (patch)
tree43df6c30d943b79c98f74bd774346afa9316fafc /makefiledir
parent80570009dd802e7403983c7e28670e7debd4c57b (diff)
downloadopenttd-1a56b830c09db377afad0793f5e07866c2c5c895.tar.xz
(svn r4183) -Codechange: [Makefile]: removed MANUAL_CONFIG as it's not used anymore
This should hopefully fix the issue where WITH_SDL can be defined while SDL-CONFIG is not Added an error if WITH_SDL is defined but SDL-CONFIG is not. The same goes for WITH_PNG even though nobody reported this as a problem removed STATIC_ZLIB_PATH as it turns out that nobody used it
Diffstat (limited to 'makefiledir')
-rw-r--r--makefiledir/Makefile.config_writer1
-rw-r--r--makefiledir/Makefile.libdetection3
2 files changed, 3 insertions, 1 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index a305c89d0..2f3351a32 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -67,7 +67,6 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
$(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,)
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index 237c02f98..a8859505f 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -68,6 +68,9 @@ else
SDL-CONFIG:=sdl-config
endif
+# set libpng-config to the default value
+LIBPNG-CONFIG :=libpng-config
+
# Networking, enabled by default
WITH_NETWORK:=1