dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3273) -Fix: [OSX] PPC part of universal binaries now target 10.3 instead of 10.4

Browse Source 
10.2 support appears to be broken right now
	Changed BUILD_UNIVERSAL_BINARY into FAT_BINARY (I got tired of typing)
This commit is contained in:
bjarni
2005-12-09 11:08:24 +00:00
parent e486e56050
commit 79b76e2397
4 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
os/macosx/Makefile
View File

@@ -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)