(svn r3286) -Fix: [OSX] 10.2 works again and universal binaries got 10.2 as target by default

5 files changed, 17 insertions, 5 deletions

diff --git a/music/qtmidi.c b/music/qtmidi.c
index b245b538d..dc668c8b0 100644
--- a/music/qtmidi.c
+++ b/music/qtmidi.c
@@ -26,7 +26,6 @@
  */
 #include "../stdafx.h"
 #include "../openttd.h"
-#include "../debug.h"
 #include "qtmidi.h"
 
 /*
@@ -52,6 +51,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+// we need to include debug.h after CoreServices because defining DEBUG will break CoreServices in OSX 10.2
+#include "../debug.h"
 
 
 enum {
diff --git a/network_core.h b/network_core.h
index 855e5f2c3..98dcea13a 100644
--- a/network_core.h
+++ b/network_core.h
@@ -11,6 +11,14 @@
 
 #ifdef ENABLE_NETWORK
 
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#if (MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_2)
+	// OSX 10.2 don't have socklen_t defined, so we will define it here
+	typedef int socklen_t;
+#endif
+#endif
+
 // Windows stuff
 #if defined(WIN32) || defined(WIN64)
 #include <winsock2.h>
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
index f42f34bf4..8d22780fc 100644
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -31,10 +31,10 @@ endif
 
 # setup flags if none are defined
 ifndef CFLAGS_PPC
-	CFLAGS_PPC:= -isysroot /Developer/SDKs/MacOSX10.3.9.sdk
+	CFLAGS_PPC:= -isysroot /Developer/SDKs/MacOSX10.2.8.sdk
 endif
 ifndef LDFLAGS_PPC
-	LDFLAGS_PPC:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk
+	LDFLAGS_PPC:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk
 endif
 ifndef PPC_CC
 	PPC_CC:=powerpc-apple-darwin8-gcc-4.0.0
@@ -105,6 +105,7 @@ $(error no x86 SDL lib found)
 		CC_TARGET:=$(x86_CC)
 		# clear the cached list of PPC libs
 		LIBS:=
+		OBJS:=
 		CFLAGS:= $(CFLAGS_x86) -arch i386
 		LDFLAGS:= $(LDFLAGS_x86)
 	else
diff --git a/os/macosx/macos.m b/os/macosx/macos.m
index 6c5fa8791..ee791166a 100644
--- a/os/macosx/macos.m
+++ b/os/macosx/macos.m
@@ -17,7 +17,7 @@ void ShowMacAssertDialog ( const char *function, const char *file, const int lin
 {
 	const char *buffer =
 			[[NSString stringWithFormat:@"An assertion has failed and OpenTTD must quit.\n%s in %s (line %d)\n\"%s\"\n\nYou should report this error the OpenTTD developers if you think you found a bug.",
-			function, file, line, expression] cStringUsingEncoding:NSASCIIStringEncoding];
+			function, file, line, expression] cString];
 	NSLog(@"%s", buffer);
 	ShowMacDialog( "Assertion Failed", buffer, "Quit" );
 
diff --git a/video/cocoa_v.m b/video/cocoa_v.m
index 2dbc2c478..a0b7f50aa 100644
--- a/video/cocoa_v.m
+++ b/video/cocoa_v.m
@@ -27,9 +27,11 @@ extern void ShowMenuBar(void);
 extern void HideMenuBar(void);
 
 /* Disables a warning. This is needed since the method exists but has been dropped from the header, supposedly as of 10.4. */
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
 @interface NSApplication(NSAppleMenu)
 - (void)setAppleMenu:(NSMenu *)menu;
 @end
+#endif
 
 
 /* Name conflict */
@@ -1180,7 +1182,7 @@ static const char *QZ_SetVideoWindowed (uint width, uint height) {
 			return "Could not create the Cocoa window";
 
 		snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision);
-		nsscaption = [ [ NSString alloc ] initWithCString:caption encoding:NSASCIIStringEncoding ];
+		nsscaption = [ [ NSString alloc ] initWithCString:caption ];
 		[ _cocoa_video_data.window setTitle:nsscaption ];
 		[ _cocoa_video_data.window setMiniwindowTitle:nsscaption ];
 		[ nsscaption release ];