diff options
| author | bjarni <bjarni@openttd.org> | 2005-12-09 11:08:24 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-12-09 11:08:24 +0000 |
| commit | 79b76e239776992fb80ecfb20ef60be5f85e8d15 (patch) | |
| tree | 9d7e8a513a14468359dca6c32e2de0bf9e5bf0b6 /makefiledir/Makefile.config_writer | |
| parent | e486e56050fe0366ca2538be0b268710b75ba7f4 (diff) | |
| download | openttd-79b76e239776992fb80ecfb20ef60be5f85e8d15.tar.xz | |
(svn r3273) -Fix: [OSX] PPC part of universal binaries now target 10.3 instead of 10.4
10.2 support appears to be broken right now
Changed BUILD_UNIVERSAL_BINARY into FAT_BINARY (I got tired of typing)
Diffstat (limited to 'makefiledir/Makefile.config_writer')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 15780062c..4b56391b6 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -94,17 +94,26 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,) $(call CONFIG_LINE,\# Universal binary setup) - $(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,\# use these settings for building universal binaries. Most systems should work with the default settings) $(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,\# if you got a fat libpng you should not need to change this. It is recommended to get a fat libpng lib) + $(call CONFIG_LINE,LIBPNG_PPC_CONFIG:=$(LIBPNG_PPC_CONFIG)) $(call CONFIG_LINE,LIBPNG_x86_CONFIG:=$(LIBPNG_x86_CONFIG)) + + $(call CONFIG_LINE,\# autodetected SDL lib path, but it is not detected in a reliable way, so verify it. It needs to be the x86 lib) $(call CONFIG_LINE,x86_SDL_LIB:=$(x86_SDL_LIB)) + + $(call CONFIG_LINE,\# default values should be good enough for the rest of the universal binary flags, but check them anyway) + $(call CONFIG_LINE,SKIP_LIB_TEST:=$(SKIP_LIB_TEST)) + $(call CONFIG_LINE,PPC_CC:=$(PPC_CC)) + $(call CONFIG_LINE,CFLAGS_PPC:=$(CFLAGS_PPC)) + $(call CONFIG_LINE,LDFLAGS_PPC:=$(LDFLAGS_PPC)) + + $(call CONFIG_LINE,x86_CC:=$(x86_CC)) + $(call CONFIG_LINE,CFLAGS_x86:=$(CFLAGS_x86)) + $(call CONFIG_LINE,LDFLAGS_x86:=$(LDFLAGS_x86)) $(call CONFIG_LINE,) $(call CONFIG_LINE,\# For cross-compiling) |