diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-08 07:58:24 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-08 07:58:24 +0000 |
| commit | 634a5f1c0d63f0e43f764f86b4c86de67bda1157 (patch) | |
| tree | 54e17f4e303a7d5e915073c64299a50640450d2d /macosx/PcsxrController.m | |
| parent | ea095b6ff6b52f2ca53c089ab31d57d9441fec8d (diff) | |
| download | pcsxr-634a5f1c0d63f0e43f764f86b4c86de67bda1157.tar.gz | |
Clang apparently doesn't respond to -falign-loops or -finline-limit. Removing them from OS X project files.
Quiet some warnings about implicit conversion from 64-bit integer to 32-bit in the main app, but only the Cocoa parts.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85897 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrController.m')
| -rwxr-xr-x | macosx/PcsxrController.m | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index 6943fcac..f47bf042 100755 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -219,7 +219,7 @@ void ShowHelpAndExit(FILE* output, int exitCode) - (void)runURL:(NSURL*)url { - if ([EmuThread active] == YES) { + if ([EmuThread active] == YES) { if (UsingIso()) { SetIsoFile([[url path] fileSystemRepresentation]); SetCdOpenCaseTime(time(NULL) + 2); @@ -241,7 +241,7 @@ void ShowHelpAndExit(FILE* output, int exitCode) - (IBAction)freeze:(id)sender { NSInteger num = [sender tag]; - [PcsxrController saveState:num]; + [PcsxrController saveState:(int)num]; } + (void)saveState:(int)num @@ -251,8 +251,8 @@ void ShowHelpAndExit(FILE* output, int exitCode) - (IBAction)defrost:(id)sender { - NSInteger num = [sender tag]; - [PcsxrController loadState:num]; + NSInteger num = [sender tag]; + [PcsxrController loadState:(int)num]; } + (void)loadState:(int)num @@ -558,7 +558,7 @@ otherblock();\ str = [[defaults stringForKey:@"Bios"] fileSystemRepresentation]; if (str) { NSString *path = [defaults stringForKey:@"Bios"]; - int index = [biosList indexOfObject:path]; + NSInteger index = [biosList indexOfObject:path]; if (-1 == index) { [biosList insertObject:path atIndex:0]; |