summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-01-07 12:53:57 +0000
committerbjarni <bjarni@openttd.org>2006-01-07 12:53:57 +0000
commit015db8a461c7d78956bcf67cb0b36b2b27e02588 (patch)
treef57ac92bd71c9b99924fb31dd26bf2ed80cefb87
parente8c871a603e79e14df9280b65c3c3f1315760f7c (diff)
downloadopenttd-015db8a461c7d78956bcf67cb0b36b2b27e02588.tar.xz
(svn r3382) -Feature: [OSX] added the flag JAGUAR to crosscompile for OSX 10.2.8 on 10.4
-rw-r--r--Makefile5
-rw-r--r--os/macosx/Makefile.setup8
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9b00eecb7..2f34526a9 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,10 @@
#
# Special for crosscompiling there are some commands available:
#
-# FAT_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs
+# FAT_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs. Only works with GCC 4 or newer
+#
+# JAGUAR: Crosscompiling for OSX 1.2.8 (codenamed Jaguar). Only works if OSX is defined too. Only works with GCC 4 or newer
+# This can be changed to any PPC version of OSX by changing the ppc flags in Makefile.config
#
# ENDIAN_FORCE: forces the endian-check to give a certain result. Can be BE, LE or PREPROCESSOR.
# PREPROCESSOR is always used on all OSX targets and will make the preprocessor pick the right endian.
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
index 8d22780fc..befa231c5 100644
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -68,6 +68,14 @@ ifdef WITH_SDL
endif
endif
+ifdef JAGUAR
+ LIBPNG-CONFIG:=$(LIBPNG_PPC_CONFIG)
+ SDL-CONFIG:=$(SDL_PPC_CONFIG)
+ CC_TARGET:=$(PPC_CC)
+ CFLAGS:= $(CFLAGS_PPC) -arch ppc
+ LDFLAGS:= $(LDFLAGS_PPC)
+endif
+
ifdef FAT_BINARY
# set up config files
ifndef SKIP_LIB_TEST