diff options
| author | bjarni <bjarni@openttd.org> | 2005-12-04 17:36:19 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-12-04 17:36:19 +0000 |
| commit | 961b71f434199c2c57666c0c88e8e4aa85b07f3c (patch) | |
| tree | f7a52e0669f30866989cc02d38d34e83a2ee701c /makefiledir/Makefile.config_writer | |
| parent | 8277a0651e8a9b74187bfbc8a83a80bc90600345 (diff) | |
| download | openttd-961b71f434199c2c57666c0c88e8e4aa85b07f3c.tar.xz | |
(svn r3258) -Feature: [OSX] added support for universal binaries
it needs both PPC and x86 libs to compile
due to this fact, compilation with libPNG or SDL is not tested (dedicated servers only)
only PPC part is tested as I don't have x86 OSX
Diffstat (limited to 'makefiledir/Makefile.config_writer')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 982a91fe5..442eae12a 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -92,6 +92,14 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,MINGW:=$(MINGW)) $(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,\# For cross-compiling) $(call CONFIG_LINE,CC_TARGET:=$(CC_TARGET)) $(call CONFIG_LINE,CC_HOST:=$(CC_HOST)) |