summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-12-10 23:03:59 +0000
committerbjarni <bjarni@openttd.org>2005-12-10 23:03:59 +0000
commit42d8e8410b39c9f0ce2bf89df060fa5ece82e0c9 (patch)
tree4799043dc3a50980134763ad405adda574693d1f /os
parentbe65f908c8ffb2cf1e9787f302acd4fb6dfafd8d (diff)
downloadopenttd-42d8e8410b39c9f0ce2bf89df060fa5ece82e0c9.tar.xz
(svn r3286) -Fix: [OSX] 10.2 works again and universal binaries got 10.2 as target by default
Diffstat (limited to 'os')
-rw-r--r--os/macosx/Makefile.setup5
-rw-r--r--os/macosx/macos.m2
2 files changed, 4 insertions, 3 deletions
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" );