(svn r3276) reverted the last two commits. OSX 10.2 kept finding new stuff to prevent it from running OpenTTD, so now it's not supported anymore

2 files changed, 7 insertions, 42 deletions

diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index 4f952de8b..577bf420a 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -4,7 +4,7 @@
 
 ifdef FAT_BINARY
 FAT_BINARY:=build_universal_binary
-POST_BUNDLE_BUILDING:=$(Q)cp $(x86_SDL_LIB) $(OSXAPP)/Contents/lib/libSDL-x86.dylib
+COPY_x86_SDL_LIB:=$(Q)cp $(x86_SDL_LIB) $(OSXAPP)/Contents/lib/libSDL-x86.dylib
 endif
 
 ifdef UNIVERSAL_x86_PART
@@ -14,17 +14,6 @@ else
 BUILD_OSX_BUNDLE:=build_OSX_bundle
 endif
 
-ifdef JAGUAR
-JAGUAR:=jaguar
-POST_BUNDLE_BUILDING:=$(Q)cp /usr/lib/libmx.A.dylib $(OSXAPP)/Contents/lib/libmx.A.dylib
-endif
-
-# MacOS X got some issues in OpenTTD, so we got a workaround target to solve them
-# only network support will not be fixed this way, so we will have a binary without network support
-
-$(JAGUAR):
-	$(Q)install_name_tool -change /usr/lib/libmx.A.dylib @executable_path/../lib/libmx.A.dylib $(TTD)
-
 # 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
@@ -44,7 +33,7 @@ $(FAT_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) $(FAT_BINARY) $(JAGUAR)
+$(BUILD_OSX_BUNDLE): $(TTD) $(FAT_BINARY)
 	@echo '===> Building application bundle'
 	$(Q)rm -fr "$(OSXAPP)"
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
@@ -58,7 +47,7 @@ $(BUILD_OSX_BUNDLE): $(TTD) $(FAT_BINARY) $(JAGUAR)
 	$(Q)cp data/* "$(OSXAPP)"/Contents/Data/
 	$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/Lang/
 	$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
-	$(POST_BUNDLE_BUILDING)
+	$(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
@@ -81,4 +70,4 @@ release: all
 
 $(OSX): $(TTD) $(BUILD_OSX_BUNDLE)
 
-.PHONY: release $(BUILD_OSX_BUNDLE) $(FAT_BINARY) $(JAGUAR)
+.PHONY: release $(BUILD_OSX_BUNDLE) $(FAT_BINARY)
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
index 9b8441856..f42f34bf4 100644
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -29,29 +29,16 @@ $(warning Compiling a release build, that is a debug build)
 endif
 endif
 
-ifdef JAGUAR
-ifdef FAT_BINARY
-$(error FAT_BINARY and JAGUAR can't be used at the same time)
-endif
-endif
-
 # setup flags if none are defined
-ifndef CFLAGS_JAGUAR
-	CFLAGS_JAGUAR:= -isysroot /Developer/SDKs/MacOSX10.2.8.sdk
-endif
-ifndef LDFLAGS_JAGUAR
-	LDFLAGS_JAGUAR:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk
-endif
-
-ifndef PPC_CC
-	PPC_CC:=powerpc-apple-darwin8-gcc-4.0.0
-endif
 ifndef CFLAGS_PPC
 	CFLAGS_PPC:= -isysroot /Developer/SDKs/MacOSX10.3.9.sdk
 endif
 ifndef LDFLAGS_PPC
 	LDFLAGS_PPC:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk
 endif
+ifndef PPC_CC
+	PPC_CC:=powerpc-apple-darwin8-gcc-4.0.0
+endif
 ifndef CFLAGS_x86
 	CFLAGS_x86:= -isysroot /Developer/SDKs/MacOSX10.4u.sdk
 endif
@@ -128,14 +115,3 @@ $(error no x86 SDL lib found)
 		LDFLAGS:= $(LDFLAGS_PPC)
 	endif
 endif
-
-ifdef JAGUAR
-	CFLAGS:=$(CFLAGS_JAGUAR)
-	LDFLAGS:=$(LDFLAGS_JAGUAR)
-	# network support is broken is jaguar (OSX 10.2)
-	WITH_NETWORK:=
-	# crosscompiling for jaguar should always be static
-	STATIC:=1
-	# libpng appears to break it too
-	WITH_PNG:=
-endif
\ No newline at end of file