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

(svn r4183) -Codechange: [Makefile]: removed MANUAL_CONFIG as it's not used anymore

Browse Source 
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
This commit is contained in:
bjarni
2006-03-30 20:14:06 +00:00
parent 1b28d92fc8
commit f70c45782e
3 changed files with 15 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
makefiledir/Makefile.config_writer
View File

@@ -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,)

3
makefiledir/Makefile.libdetection
View File

@@ -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