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/ConfigurationController.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/ConfigurationController.m')
| -rwxr-xr-x | macosx/ConfigurationController.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m index 794b310f..ce0e6d19 100755 --- a/macosx/ConfigurationController.m +++ b/macosx/ConfigurationController.m @@ -83,7 +83,7 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; if ([openDlg runModal] == NSFileHandlingPanelOKButton) { NSURL *mcdURL = [[openDlg URLs] objectAtIndex:0]; - [ConfigurationController setMemoryCard:tag toURL:mcdURL]; + [ConfigurationController setMemoryCard:(int)tag toURL:mcdURL]; } RELEASEOBJ(openDlg); } @@ -114,14 +114,14 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; strlcpy(mcd, [[mcdURL path] fileSystemRepresentation], MAXPATHLEN); CreateMcd(mcd); - [ConfigurationController setMemoryCard:tag toURL:mcdURL]; + [ConfigurationController setMemoryCard:(int)tag toURL:mcdURL]; } RELEASEOBJ(openDlg); } - (IBAction)setVideoType:(id)sender { - int tag = [[sender selectedItem] tag]; + NSInteger tag = [[sender selectedItem] tag]; if (3 == tag) { [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"AutoDetectVideoType"]; @@ -193,7 +193,7 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; // setup labels - int tag = [defaults integerForKey:@"AutoDetectVideoType"]; + NSInteger tag = [defaults integerForKey:@"AutoDetectVideoType"]; if (tag) tag = 3; else { |