summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-12-09 11:08:24 +0000
committerbjarni <bjarni@openttd.org>2005-12-09 11:08:24 +0000
commit578883266f1c7c1d5825b99e8474694b3423bafe (patch)
tree9d7e8a513a14468359dca6c32e2de0bf9e5bf0b6 /Makefile
parent05fbf0ada53cd461a1415c37e051bfcd7276a289 (diff)
downloadopenttd-578883266f1c7c1d5825b99e8474694b3423bafe.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 'Makefile')
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1c544d505..e5e02d4a5 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@
#
# Special for crosscompiling there are some commands available:
#
-# BUILD_UNIVERSAL_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
#
# 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.
@@ -508,8 +508,12 @@ ifdef OSX
# set the endian flag for OSX, that can't fail
ENDIAN_FORCE:=PREPROCESSOR
- # ensure that changing libpathnames will not overwrite anything in the binary
- LDFLAGS += -headerpad_max_install_names
+ ifdef UNIVERSAL_x86_PART
+ ifdef WITH_SDL
+ # ensure that changing libpathnames will not overwrite anything in the binary
+ LDFLAGS += -headerpad_max_install_names
+ endif
+ endif
ifndef DEDICATED
LIBS += -framework QuickTime