OS X:

Upgrade the Xcode project.
Remove the localized display name.

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

14 files changed, 24 insertions, 177 deletions

diff --git a/macosx/English.lproj/en.lproj/InfoPlist.strings b/macosx/English.lproj/en.lproj/InfoPlist.strings
index 362dedc3..f05b056b 100644
--- a/macosx/English.lproj/en.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/en.lproj/InfoPlist.strings
@@ -1,10 +1,10 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "PCSXR";
+CFBundleName = "PCSX-R";
 CFBundleDisplayName = "PCSX Reloaded";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 "Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 "Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "PSX Memory Card";
diff --git a/macosx/English.lproj/fr.lproj/InfoPlist.strings b/macosx/English.lproj/fr.lproj/InfoPlist.strings
index f8d88f4f..5aa17e39 100644
--- a/macosx/English.lproj/fr.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/fr.lproj/InfoPlist.strings
@@ -2,11 +2,10 @@
 
 //Commented out strings are those that need to be translated
 
-CFBundleName = "PCSXR";
-CFBundleDisplayName = "PCSX Reloaded";
+CFBundleName = "PCSX-R";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 "Playstation Emulator Plug-in" = "PlayStation Emulator Greffon"; //Incomplete/mangled translation
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "Format de carte mémoire PSX";
diff --git a/macosx/English.lproj/hu.lproj/InfoPlist.strings b/macosx/English.lproj/hu.lproj/InfoPlist.strings
index 85a6d34a..52367ca7 100644
--- a/macosx/English.lproj/hu.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/hu.lproj/InfoPlist.strings
@@ -2,11 +2,11 @@
 
 //Commented out strings are those that need to be translated
 
-CFBundleName = "PCSXR";
+CFBundleName = "PCSX-R";
 CFBundleDisplayName = "PCSX Reloaded";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 //"Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "Psx memória kártya formátum";
diff --git a/macosx/English.lproj/it.lproj/InfoPlist.strings b/macosx/English.lproj/it.lproj/InfoPlist.strings
index 3b266e21..9356053e 100644
--- a/macosx/English.lproj/it.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/it.lproj/InfoPlist.strings
@@ -2,11 +2,10 @@
 
 //Commented out strings are those that need to be translated
 
-CFBundleName = "PCSXR";
-CFBundleDisplayName = "PCSX Reloaded";
+CFBundleName = "PCSX-R";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 //"Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "Formato memory card della psx";
diff --git a/macosx/English.lproj/ko-KR.lproj/InfoPlist.strings b/macosx/English.lproj/ko-KR.lproj/InfoPlist.strings
index 93b610d7..a0443ba3 100644
--- a/macosx/English.lproj/ko-KR.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/ko-KR.lproj/InfoPlist.strings
@@ -1,10 +1,11 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "PCSXR";
-CFBundleDisplayName = "PCSX Reloaded";
+//Commented out strings are those that need to be translated
+
+CFBundleName = "PCSX-R";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 //"Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "Psx 메모리카드";
diff --git a/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings b/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings
index b40cb0c4..f79a80e7 100644
--- a/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/pt-BR.lproj/InfoPlist.strings
@@ -2,11 +2,10 @@
 
 //Commented out strings are those that need to be translated
 
-CFBundleName = "PCSXR";
-CFBundleDisplayName = "PCSX Reloaded";
+CFBundleName = "PCSX-R";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 //"Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "Qualquer formato";
diff --git a/macosx/English.lproj/ru.lproj/InfoPlist.strings b/macosx/English.lproj/ru.lproj/InfoPlist.strings
index 133b32d1..c3940327 100644
--- a/macosx/English.lproj/ru.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/ru.lproj/InfoPlist.strings
@@ -2,11 +2,10 @@
 
 //Commented out strings are those that need to be translated
 
-CFBundleName = "PCSXR";
-CFBundleDisplayName = "PCSX Reloaded";
+CFBundleName = "PCSX-R";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 //"Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "Форматы карт памяти psx";
diff --git a/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings b/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings
index 33a959c7..d2806b54 100644
--- a/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/zh-Hans.lproj/InfoPlist.strings
@@ -1,10 +1,9 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "PCSXR";
-CFBundleDisplayName = "PCSX Reloaded";
+CFBundleName = "PCSX-R";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 CFBundleGetInfoString = "PlayStation 模拟器源代码 PCSX-df 项目.";
-NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 "Playstation Emulator Plug-in" = "PlayStation 模拟器插件安装";
 "Playstation BIOS Image" = "PlayStation BIOS 映像";
 "PCSXR Memory Card" = "Psx 记忆卡格式";
diff --git a/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings b/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings
index dd32b34f..63b28e38 100644
--- a/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/zh-Hant.lproj/InfoPlist.strings
@@ -2,11 +2,11 @@
 
 //Commented out strings are those that need to be translated
 
-CFBundleName = "PCSXR";
+CFBundleName = "PCSX-R";
 CFBundleDisplayName = "PCSX Reloaded";
 CFBundleShortVersionString = "PCSX-Reloaded 1.9.95";
 //CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
-//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2013 PCSX-Reloaded Team.";
+//NSHumanReadableCopyright = "Copyright © 2003-2005 PCSX Team, Gil Pedersen, Nicolas Pepin-Perreault.\nCopyright © 2009-2014 PCSX-Reloaded Team.";
 //"Playstation Emulator Plug-in" = "PlayStation Emulator Plug-in";
 //"Playstation BIOS Image" = "PlayStation BIOS Image";
 "PCSXR Memory Card" = "PS 記憶卡格式";
diff --git a/macosx/Info.plist b/macosx/Info.plist
index 1d71a818..a6ce6db7 100644
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -158,8 +158,6 @@
 	<string>SVNREVISION</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
-	<key>LSHasLocalizedDisplayName</key>
-	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index d4a22744..be498e04 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -1890,7 +1890,7 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 			};
 			buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsxr" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -2074,7 +2074,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Remove all headers from copied frameworks\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name Headers -o -name PrivateHeaders -print0 | xargs -0 rm -rf\n";
+			shellScript = "# Remove all headers from copied frameworks\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name Headers -print0 | xargs -0 rm -rf\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name PrivateHeaders -print0 | xargs -0 rm -rf\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -3117,7 +3117,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3142,7 +3141,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				CODE_SIGN_IDENTITY = "";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -3165,7 +3163,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -3481,6 +3478,7 @@
 					../libpcsxcore,
 					../macosx,
 				);
+				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
 		};
diff --git a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme b/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme
index af65e0b9..0f4567f7 100644
--- a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme
+++ b/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/PCSXR.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/SPUSharedCode.xcscheme b/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/SPUSharedCode.xcscheme
deleted file mode 100644
index 975a74c4..00000000
--- a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/SPUSharedCode.xcscheme
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0500"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "551A76E61786971B0052D185"
-               BuildableName = "libSPUSharedCode.dylib"
-               BlueprintName = "SPUSharedCode"
-               ReferencedContainer = "container:Pcsxr.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/updateInfoPlist.xcscheme b/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/updateInfoPlist.xcscheme
deleted file mode 100644
index 294aeb77..00000000
--- a/macosx/Pcsxr.xcodeproj/xcshareddata/xcschemes/updateInfoPlist.xcscheme
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0500"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "55534AEF18183BFA006D6BCB"
-               BuildableName = "updateInfoPlist"
-               BlueprintName = "updateInfoPlist"
-               ReferencedContainer = "container:Pcsxr.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "55534AEF18183BFA006D6BCB"
-            BuildableName = "updateInfoPlist"
-            BlueprintName = "updateInfoPlist"
-            ReferencedContainer = "container:Pcsxr.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "55534AEF18183BFA006D6BCB"
-            BuildableName = "updateInfoPlist"
-            BlueprintName = "updateInfoPlist"
-            ReferencedContainer = "container:Pcsxr.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "55534AEF18183BFA006D6BCB"
-            BuildableName = "updateInfoPlist"
-            BlueprintName = "updateInfoPlist"
-            ReferencedContainer = "container:Pcsxr.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>