From 3720dc59ca7c9bb98e952ff9c3cd8d88f03b9f93 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 10 Jan 2013 21:00:20 +0000
Subject: Disable the dynarec core on OS X i386. It will still run in 64-bit
 mode.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82185 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/PcsxrController.m | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'macosx/PcsxrController.m')

diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index d823a852..d312dd07 100755
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -302,6 +302,13 @@ NSString *saveStatePath;
 	for (NSString *key in prefByteKeys) {
 		u8 *dst = (u8 *)[[prefByteKeys objectForKey:key] pointerValue];
 		if (dst != nil) *dst = [defaults integerForKey:key];
+#ifdef __i386__
+		//i386 on OS X doesn't like the dynarec core
+		if ([key isEqualToString:@"NoDynarec"]) {
+			*dst = 1;
+			[defaults setBool:YES forKey:key];
+		}
+#endif
 	}
 
 	// special cases
@@ -495,7 +502,7 @@ NSString *saveStatePath;
 + (NSString*)saveStatePath:(int)slot
 {
     if(slot >= 0) {
-        return [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3ld.pcsxrstate", CdromId, (long)slot]];
+        return [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3d.pcsxrstate", CdromId, slot]];
     }
     
     return saveStatePath;
-- 
cgit v1.2.3