you can still use SDL drivers if you like and you have to run "make upgradeconf" to start using the cocoa drivers (or manually write WITH_COCOA:=1) since SDL breaks the cocoa drivers, you can't compile with both SDL and cocoa support Using cocoa drivers makes it easier to make universal binaries and it solves: -FS#18 [OSX] SDL is weird in universal binaries -FS#2 [OSX] lazy pointer crash on exit -FS#10 [OSX] linking error when linking statically to SDL 1.2.8 (needless to explain this, but it means it should be able to compile statically with the default settings now) -[ 1215073 ] Switching to large size out of fullscreen crashes Using SDL drivers will still have those issues though
		
			
				
	
	
		
			75 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			75 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
# $Id: Makefile 3214 2005-11-17 19:43:37Z bjarni $
 | 
						|
# This makefile is not a standalone makefile, but is called from the general one
 | 
						|
# it contains targets specific to MacOS X
 | 
						|
 | 
						|
ifdef FAT_BINARY
 | 
						|
FAT_BINARY:=build_universal_binary
 | 
						|
COPY_x86_SDL_LIB:=$(Q)cp $(x86_SDL_LIB) $(OSXAPP)/Contents/lib/libSDL-x86.dylib
 | 
						|
endif
 | 
						|
 | 
						|
ifdef UNIVERSAL_x86_PART
 | 
						|
# the bundle is build by the PPC compile when making universal binaries
 | 
						|
BUILD_OSX_BUNDLE:=
 | 
						|
else
 | 
						|
BUILD_OSX_BUNDLE:=build_OSX_bundle
 | 
						|
endif
 | 
						|
 | 
						|
# building an universal binary
 | 
						|
# since we can only compile for PPC or x86 at any one time, we compile one and then
 | 
						|
# 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
 | 
						|
 | 
						|
$(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
 | 
						|
	$(Q)make UNIVERSAL_x86_PART:=1
 | 
						|
	$(Q)install_name_tool -change $(x86_SDL_LIB) @executable_path/../lib/libSDL-x86.dylib $(TTD)
 | 
						|
	$(Q)cp $(TTD) temp_binary_dir/$(TTD)_b
 | 
						|
	@echo '===> Joining the PPC and x86 binaries into one universal one'
 | 
						|
	$(Q)lipo temp_binary_dir/$(TTD)_a temp_binary_dir/$(TTD)_b -create -output $(TTD)
 | 
						|
	$(Q)rm -rf temp_binary_dir
 | 
						|
 | 
						|
# 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) $(FAT_BINARY)
 | 
						|
	@echo '===> Building application bundle'
 | 
						|
	$(Q)rm -fr "$(OSXAPP)"
 | 
						|
	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
 | 
						|
	$(Q)mkdir -p "$(OSXAPP)"/Contents/Resources
 | 
						|
	$(Q)mkdir -p "$(OSXAPP)"/Contents/Data
 | 
						|
	$(Q)mkdir -p "$(OSXAPP)"/Contents/Lang
 | 
						|
	$(Q)mkdir -p "$(OSXAPP)"/Contents/lib
 | 
						|
	$(Q)echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo
 | 
						|
	$(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
 | 
						|
	$(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)"
 | 
						|
	$(Q)cp data/* "$(OSXAPP)"/Contents/Data/
 | 
						|
	$(Q)cp os/macosx/splash.png "$(OSXAPP)"/Contents/Data/
 | 
						|
	$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/Lang/
 | 
						|
	$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
 | 
						|
	$(COPY_x86_SDL_LIB)
 | 
						|
 | 
						|
# make the release disk image. Should only be used with releases and is a good and fast way to make sure to remember all the needed files
 | 
						|
release: all
 | 
						|
	$(Q)mkdir -p "OpenTTD $(RELEASE)"
 | 
						|
	$(Q)mkdir -p "OpenTTD $(RELEASE)"/docs
 | 
						|
	$(Q)mkdir -p "OpenTTD $(RELEASE)"/scenario
 | 
						|
	$(Q)cp -R $(OSXAPP) "OpenTTD $(RELEASE)"/
 | 
						|
	$(Q)cp docs/OSX_where_did_the_package_go.txt "OpenTTD $(RELEASE)"/Where\ did\ the\ package\ go.txt
 | 
						|
	$(Q)cp readme.txt "OpenTTD $(RELEASE)"/docs/
 | 
						|
	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/readme\ if\ crashed\ on\ OSX.txt
 | 
						|
	$(Q)cp docs/console.txt "OpenTTD $(RELEASE)"/docs/
 | 
						|
	$(Q)cp COPYING "OpenTTD $(RELEASE)"/docs/
 | 
						|
	$(Q)cp changelog.txt "OpenTTD $(RELEASE)"/docs/
 | 
						|
	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/
 | 
						|
	$(Q)cp os/macosx/*.webloc "OpenTTD $(RELEASE)"
 | 
						|
	$(Q)cp known-bugs.txt "OpenTTD $(RELEASE)"/known-bugs.txt
 | 
						|
	$(Q)cp scenario/* "OpenTTD $(RELEASE)"/scenario/
 | 
						|
	$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(RELEASE)" openttd-"$(RELEASE)"-osx.dmg
 | 
						|
	$(Q)rm -fr "OpenTTD $(RELEASE)"
 | 
						|
 | 
						|
$(OSX): $(TTD) $(BUILD_OSX_BUNDLE)
 | 
						|
 | 
						|
.PHONY: release $(BUILD_OSX_BUNDLE) $(FAT_BINARY)
 |