From ecc0cd37f41b8bfd1c215c435eb17ffd0756af4a Mon Sep 17 00:00:00 2001 From: TrueLight Date: Thu, 14 Apr 2005 12:57:21 +0000 Subject: (svn r2196) -Change: updated the Makefile, now it works for crossplatform compiling (and distcc compiling via Makefile.config). Wiki is coming up soon! Big tnx to Bjarni and Lucaspiller. --- makefiledir/Makefile.config_writer | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'makefiledir/Makefile.config_writer') diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index fac2b7f1b..d48e17798 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -3,14 +3,14 @@ # Magic at work, note that you can't use commas in arguments for this CONFIG_LINE=@$(SHELL) -c 'echo $(1)' >> $(MAKE_CONFIG) 2> /dev/null -$(MAKE_CONFIG): - +$(MAKE_CONFIG): + touch $(MAKE_CONFIG) - - $(call CONFIG_LINE,\# OpenTTD config file for makefile) + + $(call CONFIG_LINE,\# OpenTTD config file for makefile) $(call CONFIG_LINE,\# Set your options here - 1 for use and empty for disable) $(call CONFIG_LINE,) - + $(call CONFIG_LINE,\# User setup flags) $(call CONFIG_LINE,\# Translator: adds TODO to any untranslated strings) $(call CONFIG_LINE,\# Display_Warnings: when off it hides some warnings while compiling) @@ -30,11 +30,11 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,WITH_NETWORK:=$(WITH_NETWORK)) $(call CONFIG_LINE,DEDICATED:=$(DEDICATED)) $(call CONFIG_LINE,) - + $(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding) $(call CONFIG_LINE,DISABLE_ASSERTS:=$(DISABLE_ASSERTS)) $(call CONFIG_LINE,) - + $(call CONFIG_LINE,\# See Makefile for details on these paths) $(call CONFIG_LINE,\# Folders should not end with /) $(call CONFIG_LINE,INSTALL:=$(INSTALL)) @@ -46,7 +46,7 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,SECOND_DATA_PATH:=$(SECOND_DATA_PATH)) $(call CONFIG_LINE,CUSTOM_LANG_PATH:=$(CUSTOM_LANG_PATH)) $(call CONFIG_LINE,) - + $(call CONFIG_LINE,\# Experimental) $(call CONFIG_LINE,WITH_DIRECTMUSIC:=$(WITH_DIRECTMUSIC)) $(call CONFIG_LINE,) @@ -58,7 +58,7 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,\# Inform us if you have success) $(call CONFIG_LINE,SKIP_STATIC_CHECK:=$(SKIP_STATIC_CHECK)) $(call CONFIG_LINE,) - $(call CONFIG_LINE,) + $(call CONFIG_LINE,) $(call CONFIG_LINE,\# Everything below this line is autogenerated) $(call CONFIG_LINE,\#) @@ -66,15 +66,15 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,\# If that does not fix the problem, you should make a bug report.) $(call CONFIG_LINE,\# It would really help if you could tell how to autodetect the missing setting) $(call CONFIG_LINE,\# That info could be where the missing lib is placed) - $(call CONFIG_LINE,) - + $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# Libs) $(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,) - + $(call CONFIG_LINE,\# OS flags) $(call CONFIG_LINE,WIN32:=$(WIN32)) $(call CONFIG_LINE,UNIX:=$(UNIX)) @@ -85,8 +85,16 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,SUNOS:=$(SUNOS)) $(call CONFIG_LINE,CYGWIN:=$(CYGWIN)) $(call CONFIG_LINE,MINGW:=$(MINGW)) - $(call CONFIG_LINE,) - + $(call CONFIG_LINE,) + + $(call CONFIG_LINE,\# For cross-compiling) + $(call CONFIG_LINE,CC_TARGET:=$(CC_TARGET)) + $(call CONFIG_LINE,CC_HOST:=$(CC_HOST)) + $(call CONFIG_LINE,CFLAGS_HOST:=$(CFLAGS_HOST)) + $(call CONFIG_LINE,WINDRES:=$(WINDRES)) + $(call CONFIG_LINE,ENDIAN_FORCE:=$(ENDIAN_FORCE)) + $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# misc) $(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG)) $(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER)) -- cgit v1.2.3-54-g00ecf