summaryrefslogtreecommitdiff
path: root/makefiledir
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-12-06 22:09:28 +0000
committerbjarni <bjarni@openttd.org>2005-12-06 22:09:28 +0000
commit4bc7265b03273e1c68b4124b4aeeebfadddcbd7e (patch)
tree14795fb4adbdcb7f1d354aa91892460f98fd42ed /makefiledir
parent4f9bb11846d04003102d985c620a6a81cf10b8ba (diff)
downloadopenttd-4bc7265b03273e1c68b4124b4aeeebfadddcbd7e.tar.xz
(svn r3267) -Codechange: [OSX] universal binary makefile code cleanup
now PPC code is always compiled before x86 code strgen and lng files are only compiled once, which results in shorter building time the makefile now assigns default values to undefined values so much less needs to be set up the code is now easier to maintain
Diffstat (limited to 'makefiledir')
-rw-r--r--makefiledir/Makefile.config_writer18
1 files changed, 12 insertions, 6 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index 362757e07..15780062c 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -94,12 +94,18 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,)
$(call CONFIG_LINE,\# Universal binary setup)
- $(call CONFIG_LINE,\# use these settings for the CPU type, that is not covered by the other settings)
- $(call CONFIG_LINE,CC_UNI:=$(CC_UNI))
- $(call CONFIG_LINE,CFLAGS_UNI:=$(CFLAGS_UNI))
- $(call CONFIG_LINE,LDFLAGS_UNI:=$(LDFLAGS_UNI))
- $(call CONFIG_LINE,SDL-CONFIG_UNI:=$(SDL-CONFIG_UNI))
- $(call CONFIG_LINE,LIBPNG-CONFIG_UNI:=$(LIBPNG-CONFIG_UNI))
+ $(call CONFIG_LINE,\# use these settings for building universal binaries. Most settings should work with the default settings)
+ $(call CONFIG_LINE,UNIVERSAL_CFLAGS:=$(UNIVERSAL_CFLAGS))
+ $(call CONFIG_LINE,UNIVERSAL_LDFLAGS:=$(UNIVERSAL_LDFLAGS))
+ $(call CONFIG_LINE,SKIP_LIB_TEST:=$(SKIP_LIB_TEST))
+ $(call CONFIG_LINE,PPC_CC:=$(PPC_CC))
+ $(call CONFIG_LINE,SDL_PPC_CONFIG:=$(SDL_PPC_CONFIG))
+ $(call CONFIG_LINE,LIBPNG_PPC_CONFIG:=$(LIBPNG_PPC_CONFIG))
+ $(call CONFIG_LINE,x86_CC:=$(x86_CC))
+ $(call CONFIG_LINE,SDL_x86_CONFIG:=$(SDL_x86_CONFIG))
+ $(call CONFIG_LINE,LIBPNG_x86_CONFIG:=$(LIBPNG_x86_CONFIG))
+ $(call CONFIG_LINE,x86_SDL_LIB:=$(x86_SDL_LIB))
+ $(call CONFIG_LINE,)
$(call CONFIG_LINE,\# For cross-compiling)
$(call CONFIG_LINE,CC_TARGET:=$(CC_TARGET))