summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-03-15 14:11:17 +0000
committerbjarni <bjarni@openttd.org>2006-03-15 14:11:17 +0000
commit38569fe229ed6c09501606a6317a3cf4e54c638d (patch)
treec558d1092229d2bbdcd6bc9cf627cde5cdd78954 /os
parent3ebc41c9fed6aa3f496884f452b9aaac62da6a3d (diff)
downloadopenttd-38569fe229ed6c09501606a6317a3cf4e54c638d.tar.xz
(svn r3884) renamed TRIPPLE_BINARY to TRIPLE_BINARY
Diffstat (limited to 'os')
-rw-r--r--os/macosx/Makefile4
-rw-r--r--os/macosx/Makefile.setup4
2 files changed, 4 insertions, 4 deletions
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index 02a7660e9..de9a8481d 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -2,7 +2,7 @@
# This makefile is not a standalone makefile, but is called from the general one
# it contains targets specific to MacOS X
-ifdef TRIPPLE_BINARY
+ifdef TRIPLE_BINARY
# this is to add G5_FLAGS to ppc970 builds only. If the ability to add flags to a single arch only shows up in the future
# we can get rid of this. Xcode supports arch dependant flags, but we can't do it in the makefile (yet?)
%.o: %.c $(MAKE_CONFIG)
@@ -37,7 +37,7 @@ endif
# build the bundle. OSX wants to keep apps in bundles, so we will give it one
# the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
-$(BUILD_OSX_BUNDLE): $(TTD) $(UNIVERSAL_BINARY) $(TRIPPLE_BINARY)
+$(BUILD_OSX_BUNDLE): $(TTD)
@echo '===> Building application bundle'
$(Q)rm -fr "$(OSXAPP)"
$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
index d5419900b..4871e156e 100644
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -16,7 +16,7 @@ $(warning Compiling a release build, that is not a universal binary)
endif
endif
-ifdef TRIPPLE_BINARY
+ifdef TRIPLE_BINARY
ifdef DEBUG
$(error no G5 optimisation is made in debug builds, so tripple binaries aren't possible. Use UNIVERSAL_BINARY instead if you really want a universal debug build)
endif
@@ -74,7 +74,7 @@ ifdef UNIVERSAL_BINARY
TARGET_CPU_FLAGS:= -arch ppc -arch i386
LDFLAGS := $(LDFLAGS_UNIVERSAL) -arch ppc -arch i386
CFLAGS += $(CFLAGS_UNIVERSAL)
-ifdef TRIPPLE_BINARY
+ifdef TRIPLE_BINARY
LDFLAGS += -arch ppc970
endif
endif