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

2 files changed, 14 insertions, 1 deletions

diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index 35c812b5..4490db87 100755
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -185,6 +185,12 @@ NSString *memChangeNotifier = @"PcsxrMemoryCardDidChangeNotifier";
 		[usesHleCell setState:NSOnState];
 		[usesHleCell setEnabled:NO];
 	}
+	
+#ifdef __i386__
+	//i386 on OS X doesn't like the dynarec core
+	[usesDynarecCell setState:NSOffState];
+	[usesDynarecCell setEnabled:NO];
+#endif
 
 	// setup labels
 	[mcd1Label setTitleWithMnemonic:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.Mcd1 length:strlen(Config.Mcd1)]];
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;