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 /os/macosx/Makefile | |
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 'os/macosx/Makefile')
-rw-r--r-- | os/macosx/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/os/macosx/Makefile b/os/macosx/Makefile index 54e55db44..577bf420a 100644 --- a/os/macosx/Makefile +++ b/os/macosx/Makefile @@ -2,8 +2,8 @@ # This makefile is not a standalone makefile, but is called from the general one # it contains targets specific to MacOS X -ifdef BUILD_UNIVERSAL_BINARY -BUILD_UNIVERSAL_BINARY:=build_universal_binary +ifdef FAT_BINARY +FAT_BINARY:=build_universal_binary COPY_x86_SDL_LIB:=$(Q)cp $(x86_SDL_LIB) $(OSXAPP)/Contents/lib/libSDL-x86.dylib endif @@ -19,7 +19,7 @@ endif # we make clean and compile the other one. In the end we use lipo to join them together # when this is done, we can continue with the targets from the first run, which is build_OSX_bundle -$(BUILD_UNIVERSAL_BINARY): $(TTD) +$(FAT_BINARY): $(TTD) $(Q)mkdir -p temp_binary_dir $(Q)cp $(TTD) temp_binary_dir/$(TTD)_a $(Q)rm -rf $(TTD) $(OBJS) # delete all .o files so we can compile for a new endian @@ -33,7 +33,7 @@ $(BUILD_UNIVERSAL_BINARY): $(TTD) # 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) $(BUILD_UNIVERSAL_BINARY) +$(BUILD_OSX_BUNDLE): $(TTD) $(FAT_BINARY) @echo '===> Building application bundle' $(Q)rm -fr "$(OSXAPP)" $(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS @@ -70,4 +70,4 @@ release: all $(OSX): $(TTD) $(BUILD_OSX_BUNDLE) -.PHONY: release $(BUILD_OSX_BUNDLE) $(BUILD_UNIVERSAL_BINARY) +.PHONY: release $(BUILD_OSX_BUNDLE) $(FAT_BINARY) |