From c5ecc444641883698a22218898adc26a08c98a51 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 17 Nov 2014 23:44:47 +0100 Subject: [PATCH] (OSX PPC) reuse Settings.xib from OSX Intel --- .../OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj index 14beebe0aa..d1cd46fad1 100644 --- a/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 7A804DFD1A1A8EF7004D8B7F /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */; }; 7A899AB21A1A990C00B4EB56 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A899AB01A1A990C00B4EB56 /* MainMenu.xib */; }; + 7A899ACB1A1AB18C00B4EB56 /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7A899AC91A1AB18C00B4EB56 /* Settings.xib */; }; 7AEFCD7D192128EA00FB5B6A /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7C192128EA00FB5B6A /* utility.m */; }; 7AEFCD7F192128FE00FB5B6A /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */; }; 7AEFCD831921292900FB5B6A /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD821921292900FB5B6A /* platform.m */; }; @@ -16,7 +17,6 @@ 7AEFCD871921295E00FB5B6A /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 7AEFCD861921295E00FB5B6A /* griffin.c */; }; 962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; }; 96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; }; - 964DE7C417D84B57001CBB6C /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C617D84B57001CBB6C /* Settings.xib */; }; 967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */; }; 967894A41788F0C200D6CA69 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A21788F0C200D6CA69 /* CoreAudio.framework */; }; 967894A51788F0C200D6CA69 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */; }; @@ -29,6 +29,7 @@ /* Begin PBXFileReference section */ 7A804DFC1A1A8EF7004D8B7F /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = SOURCE_ROOT; }; 7A899AB11A1A990C00B4EB56 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/OSX/OSX/en.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; + 7A899ACA1A1AB18C00B4EB56 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../OSX/OSX/OSX/en.lproj/Settings.xib; sourceTree = SOURCE_ROOT; }; 7AEFCD7C192128EA00FB5B6A /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; }; 7AEFCD7E192128FE00FB5B6A /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; }; 7AEFCD821921292900FB5B6A /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../OSX/platform.m; sourceTree = SOURCE_ROOT; }; @@ -40,7 +41,6 @@ 96355CE51788E72A0010DBFA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 96355CE61788E72A0010DBFA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; 96355CE71788E72A0010DBFA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 964DE7C517D84B57001CBB6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Settings.xib; sourceTree = ""; }; 9678948D1788ECCA00D6CA69 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "OSX/RetroArch-Info.plist"; sourceTree = SOURCE_ROOT; }; 967894901788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; 967894A21788F0C200D6CA69 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreAudio.framework; sourceTree = DEVELOPER_DIR; }; @@ -147,10 +147,10 @@ 967894E7178A2E9B00D6CA69 /* Assets */ = { isa = PBXGroup; children = ( + 7A899AC91A1AB18C00B4EB56 /* Settings.xib */, 7A899AB01A1A990C00B4EB56 /* MainMenu.xib */, 967894E8178A2EB400D6CA69 /* modules */, C15874EE178F2094001171D4 /* RetroArch.icns */, - 964DE7C617D84B57001CBB6C /* Settings.xib */, ); name = Assets; sourceTree = ""; @@ -207,8 +207,8 @@ 967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */, 967894E9178A2EB400D6CA69 /* modules in Resources */, C15874EF178F2094001171D4 /* RetroArch.icns in Resources */, - 964DE7C417D84B57001CBB6C /* Settings.xib in Resources */, 7A899AB21A1A990C00B4EB56 /* MainMenu.xib in Resources */, + 7A899ACB1A1AB18C00B4EB56 /* Settings.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -239,13 +239,12 @@ name = MainMenu.xib; sourceTree = ""; }; - 964DE7C617D84B57001CBB6C /* Settings.xib */ = { + 7A899AC91A1AB18C00B4EB56 /* Settings.xib */ = { isa = PBXVariantGroup; children = ( - 964DE7C517D84B57001CBB6C /* en */, + 7A899ACA1A1AB18C00B4EB56 /* en */, ); name = Settings.xib; - path = OSX; sourceTree = ""; }; 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */ = {