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

13 files changed, 32 insertions, 34 deletions

diff --git a/macosx/Configs/Pcsxr-Debug.xcconfig b/macosx/Configs/Pcsxr-Debug.xcconfig
index 06e68c47..93a0b48d 100644
--- a/macosx/Configs/Pcsxr-Debug.xcconfig
+++ b/macosx/Configs/Pcsxr-Debug.xcconfig
@@ -8,4 +8,4 @@ GCC_UNROLL_LOOPS = NO
 ONLY_ACTIVE_ARCH = YES
 COPY_PHASE_STRIP = NO
 STRIP_INSTALLED_PRODUCT = NO
-OPTIMIZATION_CFLAGS = -finline-functions -finline-limit=1600 -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math
+OPTIMIZATION_CFLAGS = -finline-functions -fno-exceptions -funroll-loops -ffast-math
diff --git a/macosx/Configs/Pcsxr-Instrument.xcconfig b/macosx/Configs/Pcsxr-Instrument.xcconfig
index d125063a..4dc5367e 100644
--- a/macosx/Configs/Pcsxr-Instrument.xcconfig
+++ b/macosx/Configs/Pcsxr-Instrument.xcconfig
@@ -1,6 +1,6 @@
 #include "Pcsxr-Release.xcconfig"
 
 COPY_PHASE_STRIP = NO
-OPTIMIZATION_CFLAGS = -finline-functions -finline-limit=1600 -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math
+OPTIMIZATION_CFLAGS = -finline-functions -fno-exceptions -funroll-loops -ffast-math
 STRIP_INSTALLED_PRODUCT = NO
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES
diff --git a/macosx/Configs/Pcsxr-Release.xcconfig b/macosx/Configs/Pcsxr-Release.xcconfig
index ac99118f..e3ee3f60 100644
--- a/macosx/Configs/Pcsxr-Release.xcconfig
+++ b/macosx/Configs/Pcsxr-Release.xcconfig
@@ -6,5 +6,5 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES
 GCC_OPTIMIZATION_LEVEL = s
 GCC_UNROLL_LOOPS = YES
 COPY_PHASE_STRIP = YES
-OPTIMIZATION_CFLAGS = -finline-functions -finline-limit=1600 -fomit-frame-pointer -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math
+OPTIMIZATION_CFLAGS = -finline-functions -fomit-frame-pointer -fno-exceptions -funroll-loops -ffast-math
 STRIP_INSTALLED_PRODUCT = YES
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 {
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index d8a8cf58..4224274a 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -3165,6 +3165,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -3174,7 +3175,6 @@
 					../libpcsxcore,
 					../macosx,
 				);
-				OTHER_CFLAGS = "-fomit-frame-pointer";
 			};
 			name = Instrument;
 		};
@@ -3197,7 +3197,6 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = (
 					"-funroll-loops",
-					"-falign-loops=16",
 					"$(inherited)",
 				);
 				PRODUCT_NAME = PCSXR;
@@ -3398,11 +3397,9 @@
 				);
 				GCC_WARN_UNKNOWN_PRAGMAS = NO;
 				INFOPLIST_FILE = Info.plist;
+				LD_NO_PIE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-falign-loops=16",
-					"$(inherited)",
-				);
+				OTHER_CFLAGS = "$(inherited)";
 				PRODUCT_NAME = PCSXR;
 				WRAPPER_EXTENSION = app;
 			};
@@ -3427,7 +3424,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = (
 					"-funroll-loops",
-					"-falign-loops=16",
+					"-fomit-frame-pointer",
 					"$(inherited)",
 				);
 				PRODUCT_NAME = PCSXR;
@@ -3443,6 +3440,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -3463,6 +3461,7 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -3472,7 +3471,6 @@
 					../libpcsxcore,
 					../macosx,
 				);
-				OTHER_CFLAGS = "-fomit-frame-pointer";
 			};
 			name = Release;
 		};
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];
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index 24cba060..24c43fad 100755
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -136,7 +136,7 @@
 		return;
 	}
 	
-	cardSize = [fromCard memorySizeAtIndex:selectedIndex];
+	cardSize = [fromCard memorySizeAtIndex:(int)selectedIndex];
 	freeConsBlocks = [toCard indexOfFreeBlocksWithSize:cardSize];
 	availBlocks = [toCard availableBlocks];
 	if (freeConsBlocks == -1 && availBlocks >= cardSize) {
@@ -150,7 +150,7 @@
 		return;
 	}
 	
-	[fromCard moveBlockAtIndex:selectedIndex toMemoryCard:toCard];
+	[fromCard moveBlockAtIndex:(int)selectedIndex toMemoryCard:toCard];
 	
 	if (cardnum == 1) {
 		LoadMcd(1, Config.Mcd1);
@@ -172,7 +172,7 @@
 			CreateMcd(Config.Mcd2);
 			LoadMcd(2, Config.Mcd2);
 		}
-		[self loadMemoryCardInfoForCard:memCardSelect];
+		[self loadMemoryCardInfoForCard:(int)memCardSelect];
 	}
 }
 
@@ -216,14 +216,14 @@
 	
 	NSInteger deleteOkay = NSRunAlertPanel(NSLocalizedString(@"Delete Block", nil), NSLocalizedString(@"Deleting a block will remove all saved data on that block.\n\nThis cannot be undone.", nil), NSLocalizedString(@"Cancel", nil), NSLocalizedString(@"Delete", nil), nil);
 	if (deleteOkay == NSAlertAlternateReturn) {
-		[self deleteMemoryBlocksAtIndex:selectedIndex card:memCardSelect];
+		[self deleteMemoryBlocksAtIndex:selectedIndex card:(int)memCardSelect];
 		
 		if (memCardSelect == 1) {
 			LoadMcd(1, Config.Mcd1);
 		} else {
 			LoadMcd(2, Config.Mcd2);
 		}
-		[self loadMemoryCardInfoForCard:memCardSelect];
+		[self loadMemoryCardInfoForCard:(int)memCardSelect];
 	}
 }
 
diff --git a/macosx/PcsxrMemCardHandler.h b/macosx/PcsxrMemCardHandler.h
index 996272ec..7a4aa888 100755
--- a/macosx/PcsxrMemCardHandler.h
+++ b/macosx/PcsxrMemCardHandler.h
@@ -11,7 +11,7 @@
 
 @interface PcsxrMemCardHandler : NSWindowController <PcsxrFileHandle> {
 	IBOutlet NSTextField *cardPath;
-	int memChosen;
+	NSInteger memChosen;
 }
 - (IBAction)setMemCard:(id)sender;
 
diff --git a/macosx/PcsxrMemCardHandler.m b/macosx/PcsxrMemCardHandler.m
index 721af315..fddacb48 100755
--- a/macosx/PcsxrMemCardHandler.m
+++ b/macosx/PcsxrMemCardHandler.m
@@ -67,7 +67,7 @@
 	[[self window] orderOut:nil];
 	
 	if (memChosen != 0) {
-		[ConfigurationController setMemoryCard:memChosen toPath:theFile];
+		[ConfigurationController setMemoryCard:(int)memChosen toPath:theFile];
 	}
 	return YES;
 }
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index c113a100..e84b15d5 100755
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -55,7 +55,7 @@ typedef enum _PCSXRMemFlags {
 @property (readonly) int blockSize;
 
 @property (readonly, unsafe_unretained, nonatomic) NSImage *memImage;
-@property (readonly, nonatomic) int memIconCount;
+@property (readonly, nonatomic) unsigned memIconCount;
 @property (readonly, unsafe_unretained, nonatomic) NSString *flagName;
 @property (readonly, unsafe_unretained, nonatomic) NSAttributedString *attributedFlagName;
 @property (readonly, nonatomic) BOOL isBiggerThanOne;
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m
index df6a243b..0bb01665 100755
--- a/macosx/PcsxrMemoryObject.m
+++ b/macosx/PcsxrMemoryObject.m
@@ -218,9 +218,9 @@ static NSString *MemLabelEndLink;
 @synthesize startingIndex;
 
 #pragma mark Non-synthesize Properties
-- (int)memIconCount
+- (unsigned)memIconCount
 {
-	return [memImages count];
+	return (unsigned)[memImages count];
 }
 
 - (NSImage*)memImage
diff --git a/macosx/PcsxrPlugin.m b/macosx/PcsxrPlugin.m
index d8ec9a4c..896c7821 100755
--- a/macosx/PcsxrPlugin.m
+++ b/macosx/PcsxrPlugin.m
@@ -272,7 +272,7 @@
 {
     long (*init)();
     long (*initArg)(long arg);
-    int res = PSE_ERR_FATAL;
+    long res = PSE_ERR_FATAL;
     
     if ((active & aType) == aType) {
         return 0;
diff --git a/macosx/Plugin.c b/macosx/Plugin.c
index 691af379..7f4bba31 100755
--- a/macosx/Plugin.c
+++ b/macosx/Plugin.c
@@ -69,7 +69,7 @@ void SPUirq(void);
 	}
 
 int _OpenPlugins() {
-	int ret;
+	long ret;
 
 	GPU_clearDynarec(clearDynarec);
 
@@ -160,7 +160,7 @@ int OpenPlugins() {
 }
 
 void ClosePlugins() {
-	int ret;
+	long ret;
 
 	//signal(SIGINT, SIG_DFL);
 	//signal(SIGPIPE, SIG_DFL);
@@ -181,7 +181,7 @@ void ClosePlugins() {
 }
 
 void ResetPlugins() {
-	int ret;
+	long ret;
 
 	CDR_shutdown();
 	GPU_shutdown();