Adding an info.plist for the shared spu library on OS X.

Silence a few warnings about long to int conversions on OS X code.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86929 e17a0e51-4ae3-4d35-97c3-1a29b211df97

5 files changed, 41 insertions, 6 deletions

diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 63c40108..7b4f6030 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -638,6 +638,7 @@
 		551A777417869E830052D185 /* dfnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dfnet.h; sourceTree = "<group>"; };
 		551A777817869E830052D185 /* unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; };
 		5539965D178BB1B100859644 /* OSXPlugLocalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSXPlugLocalization.h; sourceTree = "<group>"; };
+		554572F217CBC69600FB7D19 /* SPUShared-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SPUShared-info.plist"; sourceTree = "<group>"; };
 		554FD70817C6A13E0056CF66 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
 		5550D2711683C923006C56B5 /* RecentItemsMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecentItemsMenu.h; sourceTree = "<group>"; };
 		5550D2721683C923006C56B5 /* RecentItemsMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecentItemsMenu.m; sourceTree = "<group>"; usesTabs = 1; };
@@ -1189,6 +1190,7 @@
 		551A755F17868BEC0052D185 /* Shared */ = {
 			isa = PBXGroup;
 			children = (
+				554572F217CBC69600FB7D19 /* SPUShared-info.plist */,
 				551A756017868BEC0052D185 /* Credits.rtf */,
 				551A756217868BEC0052D185 /* Localizable.strings */,
 				551A756417868BEC0052D185 /* NetSfPeopsSpuPluginMain.xib */,
@@ -2747,6 +2749,12 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GENERATE_PKGINFO_FILE = NO;
 				INSTALL_PATH = "@rpath";
+				OTHER_LDFLAGS = (
+					"-sectcreate",
+					__TEXT,
+					__info_plist,
+					"plugins/DFSound/Resorces/Shared/SPUShared-info.plist",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2764,6 +2772,12 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GENERATE_PKGINFO_FILE = NO;
 				INSTALL_PATH = "@rpath";
+				OTHER_LDFLAGS = (
+					"-sectcreate",
+					__TEXT,
+					__info_plist,
+					"plugins/DFSound/Resorces/Shared/SPUShared-info.plist",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2942,6 +2956,12 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GENERATE_PKGINFO_FILE = NO;
 				INSTALL_PATH = "@rpath";
+				OTHER_LDFLAGS = (
+					"-sectcreate",
+					__TEXT,
+					__info_plist,
+					"plugins/DFSound/Resorces/Shared/SPUShared-info.plist",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Instrument;
diff --git a/macosx/main.m b/macosx/main.m
index 1ea2a6eb..0a231786 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -251,8 +251,7 @@ void OnFile_Exit() {
 
 char* Pcsxr_locale_text(char* toloc){
 	NSBundle *mainBundle = [NSBundle mainBundle];
-	NSString *origString = nil, *transString = nil;
-	origString = @(toloc);
+	NSString *origString = @(toloc), *transString = nil;
 	transString = [mainBundle localizedStringForKey:origString value:@"" table:nil];
 	return (char*)[transString UTF8String];
 }
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m
index 41b38e2f..653bdba2 100755
--- a/macosx/plugins/DFInput/macsrc/ControllerList.m
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.m
@@ -125,7 +125,7 @@ static const int DPad[DKEY_TOTAL] = {
 			GetKeyDescription(buf, currentController, DPad[rowIndex]);
 		} else {
 			rowIndex -= DKEY_TOTAL;
-			GetAnalogDescription(buf, currentController, rowIndex / 4, rowIndex % 4);
+			GetAnalogDescription(buf, currentController, (int)(rowIndex / 4), rowIndex % 4);
 		}
 
 		return @(buf);
diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m
index d36fab50..885c1b74 100755
--- a/macosx/plugins/DFInput/macsrc/MappingCell.m
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.m
@@ -35,7 +35,7 @@
 {
 	[super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength];
 
-	long whichPad = [ControllerList currentController];
+	int whichPad = [ControllerList currentController];
 	NSTableView *tableView = (NSTableView *)[self controlView];
 	long i, changed = 0, row;
 	NSEvent *endEvent;
@@ -58,7 +58,7 @@
 			changed = ReadDKeyEvent(whichPad, [ControllerList buttonOfRow:row]);
 		} else {
 			row -= DKEY_TOTAL;
-			changed = ReadAnalogEvent(whichPad, row / 4, row % 4);
+			changed = ReadAnalogEvent(whichPad, (int)(row / 4), row % 4);
 		}
 
 		if (changed) break;
@@ -69,7 +69,7 @@
 	/* move selection to the next list element */
 	[self endEditing:textObj];
 	if (changed == 1) {
-		int nextRow = [tableView selectedRow] + 1;
+		int nextRow = (int)[tableView selectedRow] + 1;
 		if (nextRow >= [tableView numberOfRows]) {
 			[tableView deselectAll:self];
 			return;
diff --git a/macosx/plugins/DFSound/Resorces/Shared/SPUShared-info.plist b/macosx/plugins/DFSound/Resorces/Shared/SPUShared-info.plist
new file mode 100644
index 00000000..09ba9260
--- /dev/null
+++ b/macosx/plugins/DFSound/Resorces/Shared/SPUShared-info.plist
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.codeplex.pcsxr.spusharedcode</string>
+	<key>CFBundleName</key>
+	<string>SPUSharedCode</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.19</string>
+</dict>
+</plist>