diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj index 60783b3ba6..868e4ab266 100644 --- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj @@ -28,7 +28,6 @@ 50BD3F051A1BBA6100F2BD1B /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98BC877D19F83C45004FE2CB /* ApplicationServices.framework */; }; 50BD3F071A1BBA6100F2BD1B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */; }; 50BD3F081A1BBA6100F2BD1B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 967894911788ECDB00D6CA69 /* MainMenu.xib */; }; - 50BD3F091A1BBA6100F2BD1B /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 967894E8178A2EB400D6CA69 /* modules */; }; 50BD3F0A1A1BBA6100F2BD1B /* RetroArch.icns in Resources */ = {isa = PBXBuildFile; fileRef = C15874EE178F2094001171D4 /* RetroArch.icns */; }; 50BD3F0B1A1BBA6100F2BD1B /* Settings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 964DE7C617D84B57001CBB6C /* Settings.xib */; }; 50C374A919F04F7A00984F8D /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50C374A819F04F7A00984F8D /* CFExtensions.m */; }; @@ -36,6 +35,14 @@ 50EE6B811A1BB76600533C47 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C261A1BB11D00A48DD3 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 50EE6B821A1BB77D00533C47 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C241A1BB10300A48DD3 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 50EE6B831A1BB78E00533C47 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C281A1BB12F00A48DD3 /* CoreVideo.framework */; }; + 840A4D101A7CE7990015C9CD /* assets in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D0D1A7CE5250015C9CD /* assets */; }; + 840A4D131A7CEA100015C9CD /* assets in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D0D1A7CE5250015C9CD /* assets */; }; + 840A4D151A7CEA850015C9CD /* autoconfig in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D141A7CEA850015C9CD /* autoconfig */; }; + 840A4D171A7CEAF80015C9CD /* overlays in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D161A7CEAF80015C9CD /* overlays */; }; + 840A4D1B1A7CF33E0015C9CD /* shaders_cg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D181A7CF31A0015C9CD /* shaders_cg */; }; + 840A4D1C1A7CF3E80015C9CD /* autoconfig in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D141A7CEA850015C9CD /* autoconfig */; }; + 840A4D1D1A7CF3F00015C9CD /* overlays in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D161A7CEAF80015C9CD /* overlays */; }; + 840A4D1F1A7CF4040015C9CD /* shaders_cg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 840A4D181A7CF31A0015C9CD /* shaders_cg */; }; 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 */; }; @@ -45,7 +52,6 @@ 967894A51788F0C200D6CA69 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */; }; 967894A71788F0D900D6CA69 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A61788F0D900D6CA69 /* OpenGL.framework */; }; 967894A91788F0E500D6CA69 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A81788F0E500D6CA69 /* AudioUnit.framework */; }; - 967894E9178A2EB400D6CA69 /* modules in Resources */ = {isa = PBXBuildFile; fileRef = 967894E8178A2EB400D6CA69 /* modules */; }; 98AF929E192ED5C4009A8479 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 98AF929D192ED5C4009A8479 /* utility.m */; }; 98AF92A4192ED60E009A8479 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 98AF92A3192ED60E009A8479 /* RAGameView.m */; }; 98AF92B1192ED685009A8479 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AF92B0192ED685009A8479 /* griffin.c */; }; @@ -53,18 +59,69 @@ C15874EF178F2094001171D4 /* RetroArch.icns in Resources */ = {isa = PBXBuildFile; fileRef = C15874EE178F2094001171D4 /* RetroArch.icns */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + 840A4D0F1A7CE77B0015C9CD /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = modules; + dstSubfolderSpec = 7; + files = ( + 840A4D171A7CEAF80015C9CD /* overlays in CopyFiles */, + 840A4D151A7CEA850015C9CD /* autoconfig in CopyFiles */, + 840A4D101A7CE7990015C9CD /* assets in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 840A4D121A7CE9F90015C9CD /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = modules; + dstSubfolderSpec = 7; + files = ( + 840A4D1D1A7CF3F00015C9CD /* overlays in CopyFiles */, + 840A4D1C1A7CF3E80015C9CD /* autoconfig in CopyFiles */, + 840A4D131A7CEA100015C9CD /* assets in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 840A4D1A1A7CF3290015C9CD /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = modules/shaders; + dstSubfolderSpec = 7; + files = ( + 840A4D1B1A7CF33E0015C9CD /* shaders_cg in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 840A4D1E1A7CF3F50015C9CD /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = modules/shaders; + dstSubfolderSpec = 7; + files = ( + 840A4D1F1A7CF4040015C9CD /* shaders_cg in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 50351E7C192E5E8900668AB1 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = ../settings.m; sourceTree = ""; }; 50351E7E192E5EC100668AB1 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = ../platform.m; sourceTree = ""; }; 5053552F185E0F4000926C26 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 50BD3F0F1A1BBA6100F2BD1B /* RetroArch 10.6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RetroArch 10.6.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 50BD3F101A1BBA6100F2BD1B /* RetroArch 10.6-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "RetroArch 10.6-Info.plist"; path = "RetroArch 10.6-Info.plist"; sourceTree = ""; }; + 50BD3F101A1BBA6100F2BD1B /* RetroArch 10.6-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "RetroArch 10.6-Info.plist"; sourceTree = ""; }; 50C374A819F04F7A00984F8D /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../../common/CFExtensions.m; sourceTree = SOURCE_ROOT; }; 50C61C241A1BB10300A48DD3 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 50C61C261A1BB11D00A48DD3 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 50C61C281A1BB12F00A48DD3 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 50D66295199F28AC00CF54E3 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Cg.framework; sourceTree = ""; }; 50D66297199F344700CF54E3 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = /Library/Frameworks/Cg.framework; sourceTree = ""; }; + 840A4D0D1A7CE5250015C9CD /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../../../media/assets; sourceTree = ""; }; + 840A4D141A7CEA850015C9CD /* autoconfig */ = {isa = PBXFileReference; lastKnownFileType = folder; name = autoconfig; path = ../../../media/autoconfig; sourceTree = ""; }; + 840A4D161A7CEAF80015C9CD /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../../../media/overlays; sourceTree = ""; }; + 840A4D181A7CF31A0015C9CD /* shaders_cg */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders_cg; path = ../../../media/shaders_cg; sourceTree = ""; }; 962EE0E1178B3DF6004224FF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 96355CDF1788E72A0010DBFA /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; 96355CE21788E72A0010DBFA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; @@ -139,6 +196,10 @@ 96355CD41788E6E00010DBFA = { isa = PBXGroup; children = ( + 840A4D181A7CF31A0015C9CD /* shaders_cg */, + 840A4D161A7CEAF80015C9CD /* overlays */, + 840A4D141A7CEA850015C9CD /* autoconfig */, + 840A4D0D1A7CE5250015C9CD /* assets */, 98AF92AF192ED659009A8479 /* core */, 50638D6D192E636400A8EB4D /* osx */, 962EE0E1178B3DF6004224FF /* IOKit.framework */, @@ -233,6 +294,8 @@ 50BD3EF21A1BBA6100F2BD1B /* Sources */, 50BD3EF91A1BBA6100F2BD1B /* Frameworks */, 50BD3F061A1BBA6100F2BD1B /* Resources */, + 840A4D121A7CE9F90015C9CD /* CopyFiles */, + 840A4D1E1A7CF3F50015C9CD /* CopyFiles */, ); buildRules = ( ); @@ -250,6 +313,8 @@ 96355CDB1788E72A0010DBFA /* Sources */, 96355CDC1788E72A0010DBFA /* Frameworks */, 96355CDD1788E72A0010DBFA /* Resources */, + 840A4D0F1A7CE77B0015C9CD /* CopyFiles */, + 840A4D1A1A7CF3290015C9CD /* CopyFiles */, ); buildRules = ( ); @@ -266,7 +331,7 @@ 96355CD51788E6E00010DBFA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0500; + LastUpgradeCheck = 0610; }; buildConfigurationList = 96355CD81788E6E00010DBFA /* Build configuration list for PBXProject "RetroArch_OSX" */; compatibilityVersion = "Xcode 3.0"; @@ -293,7 +358,6 @@ files = ( 50BD3F071A1BBA6100F2BD1B /* InfoPlist.strings in Resources */, 50BD3F081A1BBA6100F2BD1B /* MainMenu.xib in Resources */, - 50BD3F091A1BBA6100F2BD1B /* modules in Resources */, 50BD3F0A1A1BBA6100F2BD1B /* RetroArch.icns in Resources */, 50BD3F0B1A1BBA6100F2BD1B /* Settings.xib in Resources */, ); @@ -305,7 +369,6 @@ files = ( 967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */, 967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */, - 967894E9178A2EB400D6CA69 /* modules in Resources */, C15874EF178F2094001171D4 /* RetroArch.icns in Resources */, 964DE7C417D84B57001CBB6C /* Settings.xib in Resources */, ); diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout index aae378c47f..bbef8712c2 100644 --- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout +++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout @@ -28,17 +28,17 @@ IDESourceControlProjectRelativeInstallPathDictionary 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 - ../../../../../apple/OSX/OSX/modules/shaders/shaders_cg + ../../../../../media/shaders_cg/ 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD - ../../../../../apple/OSX/OSX/modules/autoconfig + ../../../../../media/autoconfig 76200F0D6584D865E96F58DE862E738E88B23A3C ../../../../../.. A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 - ../../../../../apple/OSX/OSX/modules/assets + ../../../../../media/assets C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 ../../../../.. EF363D58F01B3FB341FA6C851870E60E4F080E97 - ../../../../../apple/OSX/OSX/modules/overlays + ../../../../../media/overlays IDESourceControlProjectURL https://github.com/libretro/RetroArch.git @@ -64,6 +64,14 @@ IDESourceControlWCCName assets + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + IDESourceControlWCCName + assets + IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git @@ -96,6 +104,14 @@ IDESourceControlWCCName shaders_cg + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 + IDESourceControlWCCName + shaders_cg + diff --git a/apple/OSX/OSX/modules/.empty b/apple/OSX/OSX/modules/.empty deleted file mode 100644 index e69de29bb2..0000000000