From 9e80ac26ee1d74d3da9a13aa55c4811315aee384 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Mon, 9 Feb 2015 23:24:01 -0800 Subject: [PATCH 1/6] New OSX project file. Very incomplete still. --- .../RetroArch_OSX.xcodeproj/project.pbxproj | 847 ------------------ .../xcshareddata/RetroArch_OSX.xccheckout | 121 --- .../OSX/{Resources => }/RetroArch-Info.plist | 0 .../en.lproj/InfoPlist.strings | 0 .../OSX/{Resources => }/en.lproj/MainMenu.xib | 0 .../OSX/{Resources => }/en.lproj/Settings.xib | 0 apple/RetroArch_OSX.xcodeproj/project.pbxproj | 440 +++++++++ .../contents.xcworkspacedata | 0 .../xcshareddata/RetroArch_OSX.xccheckout | 53 ++ apple/common/utility.m | 2 + .../xcshareddata/RetroArch_iOS.xccheckout | 8 - 11 files changed, 495 insertions(+), 976 deletions(-) delete mode 100644 apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj delete mode 100644 apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout rename apple/OSX/{Resources => }/RetroArch-Info.plist (100%) rename apple/OSX/{Resources => }/en.lproj/InfoPlist.strings (100%) rename apple/OSX/{Resources => }/en.lproj/MainMenu.xib (100%) rename apple/OSX/{Resources => }/en.lproj/Settings.xib (100%) create mode 100644 apple/RetroArch_OSX.xcodeproj/project.pbxproj rename apple/{OSX/OSX => }/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) create mode 100644 apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj deleted file mode 100644 index fc6aba1dff..0000000000 --- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj +++ /dev/null @@ -1,847 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 45; - objects = { - -/* Begin PBXBuildFile section */ - 50351E7D192E5E8900668AB1 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7C192E5E8900668AB1 /* settings.m */; }; - 50351E7F192E5EC100668AB1 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7E192E5EC100668AB1 /* platform.m */; }; - 50535530185E0F4000926C26 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5053552F185E0F4000926C26 /* CoreLocation.framework */; }; - 50BD3EF31A1BBA6100F2BD1B /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7C192E5E8900668AB1 /* settings.m */; }; - 50BD3EF41A1BBA6100F2BD1B /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50C374A819F04F7A00984F8D /* CFExtensions.m */; }; - 50BD3EF51A1BBA6100F2BD1B /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351E7E192E5EC100668AB1 /* platform.m */; }; - 50BD3EF61A1BBA6100F2BD1B /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 98AF929D192ED5C4009A8479 /* utility.m */; }; - 50BD3EF71A1BBA6100F2BD1B /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 98AF92A3192ED60E009A8479 /* RAGameView.m */; }; - 50BD3EF81A1BBA6100F2BD1B /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 98AF92B0192ED685009A8479 /* griffin.c */; }; - 50BD3EFA1A1BBA6100F2BD1B /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C61C281A1BB12F00A48DD3 /* CoreVideo.framework */; }; - 50BD3EFD1A1BBA6100F2BD1B /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D66297199F344700CF54E3 /* Cg.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 50BD3EFE1A1BBA6100F2BD1B /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5053552F185E0F4000926C26 /* CoreLocation.framework */; }; - 50BD3EFF1A1BBA6100F2BD1B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 962EE0E1178B3DF6004224FF /* IOKit.framework */; }; - 50BD3F001A1BBA6100F2BD1B /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A81788F0E500D6CA69 /* AudioUnit.framework */; }; - 50BD3F011A1BBA6100F2BD1B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A61788F0D900D6CA69 /* OpenGL.framework */; }; - 50BD3F021A1BBA6100F2BD1B /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A21788F0C200D6CA69 /* CoreAudio.framework */; }; - 50BD3F031A1BBA6100F2BD1B /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */; }; - 50BD3F041A1BBA6100F2BD1B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96355CE21788E72A0010DBFA /* Cocoa.framework */; }; - 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 */; }; - 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 */; }; - 50D66298199F344700CF54E3 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D66297199F344700CF54E3 /* Cg.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - 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 */; }; - 84F9A97E1A7E3B87003AF12F /* cht in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A97D1A7E3B87003AF12F /* cht */; }; - 84F9A9801A7E3B9F003AF12F /* cursors in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A97F1A7E3B9F003AF12F /* cursors */; }; - 84F9A9821A7E3BB2003AF12F /* dat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A9811A7E3BB2003AF12F /* dat */; }; - 84F9A9841A7E3C42003AF12F /* metadat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A9831A7E3C42003AF12F /* metadat */; }; - 84F9A9861A7E3C5E003AF12F /* rdb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A9851A7E3C5E003AF12F /* rdb */; }; - 84F9A9891A7E3E14003AF12F /* cht in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A97D1A7E3B87003AF12F /* cht */; }; - 84F9A98A1A7E3E1E003AF12F /* cursors in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A97F1A7E3B9F003AF12F /* cursors */; }; - 84F9A98B1A7E3E25003AF12F /* dat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A9811A7E3BB2003AF12F /* dat */; }; - 84F9A98C1A7E3E2B003AF12F /* metadat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A9831A7E3C42003AF12F /* metadat */; }; - 84F9A98D1A7E3E33003AF12F /* rdb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84F9A9851A7E3C5E003AF12F /* rdb */; }; - 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 */; }; - 967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 967894911788ECDB00D6CA69 /* MainMenu.xib */; }; - 967894A41788F0C200D6CA69 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 967894A21788F0C200D6CA69 /* CoreAudio.framework */; }; - 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 */; }; - 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 */; }; - 98BC877E19F83C45004FE2CB /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 98BC877D19F83C45004FE2CB /* ApplicationServices.framework */; }; - 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; - }; - 84F9A97C1A7E3B6B003AF12F /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = modules; - dstSubfolderSpec = 7; - files = ( - 84F9A9861A7E3C5E003AF12F /* rdb in CopyFiles */, - 84F9A9841A7E3C42003AF12F /* metadat in CopyFiles */, - 84F9A9821A7E3BB2003AF12F /* dat in CopyFiles */, - 84F9A9801A7E3B9F003AF12F /* cursors in CopyFiles */, - 84F9A97E1A7E3B87003AF12F /* cht in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 84F9A9881A7E3E02003AF12F /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = modules; - dstSubfolderSpec = 7; - files = ( - 84F9A98D1A7E3E33003AF12F /* rdb in CopyFiles */, - 84F9A98C1A7E3E2B003AF12F /* metadat in CopyFiles */, - 84F9A98B1A7E3E25003AF12F /* dat in CopyFiles */, - 84F9A98A1A7E3E1E003AF12F /* cursors in CopyFiles */, - 84F9A9891A7E3E14003AF12F /* cht 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; name = "RetroArch 10.6-Info.plist"; path = "../Resources/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 = ""; }; - 84F9A97D1A7E3B87003AF12F /* cht */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cht; path = ../../../media/libretrodb/cht; sourceTree = ""; }; - 84F9A97F1A7E3B9F003AF12F /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../../../media/libretrodb/cursors; sourceTree = ""; }; - 84F9A9811A7E3BB2003AF12F /* dat */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dat; path = ../../../media/libretrodb/dat; sourceTree = ""; }; - 84F9A9831A7E3C42003AF12F /* metadat */ = {isa = PBXFileReference; lastKnownFileType = folder; name = metadat; path = ../../../media/libretrodb/metadat; sourceTree = ""; }; - 84F9A9851A7E3C5E003AF12F /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../../../media/libretrodb/rdb; 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; }; - 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 = ../Resources/en.lproj/Settings.xib; sourceTree = ""; }; - 9678948D1788ECCA00D6CA69 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = "RetroArch-Info.plist"; path = "../Resources/RetroArch-Info.plist"; sourceTree = ""; }; - 967894901788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ../Resources/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; - 967894921788ECDB00D6CA69 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../Resources/en.lproj/MainMenu.xib; sourceTree = ""; }; - 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; }; - 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreAudioKit.framework; sourceTree = DEVELOPER_DIR; }; - 967894A61788F0D900D6CA69 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; - 967894A81788F0E500D6CA69 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/AudioUnit.framework; sourceTree = DEVELOPER_DIR; }; - 98AF929D192ED5C4009A8479 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../../common/utility.m; sourceTree = SOURCE_ROOT; }; - 98AF92A3192ED60E009A8479 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../../common/RAGameView.m; sourceTree = SOURCE_ROOT; }; - 98AF92B0192ED685009A8479 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; - 98BC877D19F83C45004FE2CB /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; - C15874EE178F2094001171D4 /* RetroArch.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = RetroArch.icns; path = ../Resources/RetroArch.icns; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 50BD3EF91A1BBA6100F2BD1B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 50BD3EFA1A1BBA6100F2BD1B /* CoreVideo.framework in Frameworks */, - 50BD3EFD1A1BBA6100F2BD1B /* Cg.framework in Frameworks */, - 50BD3EFE1A1BBA6100F2BD1B /* CoreLocation.framework in Frameworks */, - 50BD3EFF1A1BBA6100F2BD1B /* IOKit.framework in Frameworks */, - 50BD3F001A1BBA6100F2BD1B /* AudioUnit.framework in Frameworks */, - 50BD3F011A1BBA6100F2BD1B /* OpenGL.framework in Frameworks */, - 50BD3F021A1BBA6100F2BD1B /* CoreAudio.framework in Frameworks */, - 50BD3F031A1BBA6100F2BD1B /* CoreAudioKit.framework in Frameworks */, - 50BD3F041A1BBA6100F2BD1B /* Cocoa.framework in Frameworks */, - 50BD3F051A1BBA6100F2BD1B /* ApplicationServices.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 96355CDC1788E72A0010DBFA /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 50EE6B831A1BB78E00533C47 /* CoreVideo.framework in Frameworks */, - 50EE6B821A1BB77D00533C47 /* AVFoundation.framework in Frameworks */, - 50EE6B811A1BB76600533C47 /* CoreMedia.framework in Frameworks */, - 50D66298199F344700CF54E3 /* Cg.framework in Frameworks */, - 50535530185E0F4000926C26 /* CoreLocation.framework in Frameworks */, - 962EE0E2178B3DF6004224FF /* IOKit.framework in Frameworks */, - 967894A91788F0E500D6CA69 /* AudioUnit.framework in Frameworks */, - 967894A71788F0D900D6CA69 /* OpenGL.framework in Frameworks */, - 967894A41788F0C200D6CA69 /* CoreAudio.framework in Frameworks */, - 967894A51788F0C200D6CA69 /* CoreAudioKit.framework in Frameworks */, - 96355CE31788E72A0010DBFA /* Cocoa.framework in Frameworks */, - 98BC877E19F83C45004FE2CB /* ApplicationServices.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 50638D6D192E636400A8EB4D /* osx */ = { - isa = PBXGroup; - children = ( - 50351E7C192E5E8900668AB1 /* settings.m */, - 50351E7E192E5EC100668AB1 /* platform.m */, - ); - name = osx; - sourceTree = ""; - }; - 96355CD41788E6E00010DBFA = { - isa = PBXGroup; - children = ( - 84F9A9851A7E3C5E003AF12F /* rdb */, - 84F9A9831A7E3C42003AF12F /* metadat */, - 84F9A9811A7E3BB2003AF12F /* dat */, - 84F9A97F1A7E3B9F003AF12F /* cursors */, - 84F9A97D1A7E3B87003AF12F /* cht */, - 840A4D181A7CF31A0015C9CD /* shaders_cg */, - 840A4D161A7CEAF80015C9CD /* overlays */, - 840A4D141A7CEA850015C9CD /* autoconfig */, - 840A4D0D1A7CE5250015C9CD /* assets */, - 98AF92AF192ED659009A8479 /* core */, - 50638D6D192E636400A8EB4D /* osx */, - 962EE0E1178B3DF6004224FF /* IOKit.framework */, - 96355CE81788E72A0010DBFA /* common */, - 96355CE11788E72A0010DBFA /* Frameworks */, - 96355CE01788E72A0010DBFA /* Products */, - 96355CE91788E72A0010DBFA /* Resources */, - 98BC877D19F83C45004FE2CB /* ApplicationServices.framework */, - ); - indentWidth = 3; - sourceTree = ""; - tabWidth = 3; - }; - 96355CE01788E72A0010DBFA /* Products */ = { - isa = PBXGroup; - children = ( - 96355CDF1788E72A0010DBFA /* RetroArch.app */, - 50BD3F0F1A1BBA6100F2BD1B /* RetroArch 10.6.app */, - ); - name = Products; - sourceTree = ""; - }; - 96355CE11788E72A0010DBFA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 50C61C281A1BB12F00A48DD3 /* CoreVideo.framework */, - 50C61C261A1BB11D00A48DD3 /* CoreMedia.framework */, - 50C61C241A1BB10300A48DD3 /* AVFoundation.framework */, - 50D66297199F344700CF54E3 /* Cg.framework */, - 50D66295199F28AC00CF54E3 /* Cg.framework */, - 5053552F185E0F4000926C26 /* CoreLocation.framework */, - 967894A81788F0E500D6CA69 /* AudioUnit.framework */, - 967894A61788F0D900D6CA69 /* OpenGL.framework */, - 967894A21788F0C200D6CA69 /* CoreAudio.framework */, - 967894A31788F0C200D6CA69 /* CoreAudioKit.framework */, - 96355CE51788E72A0010DBFA /* AppKit.framework */, - 96355CE61788E72A0010DBFA /* CoreData.framework */, - 96355CE71788E72A0010DBFA /* Foundation.framework */, - 96355CE21788E72A0010DBFA /* Cocoa.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 96355CE81788E72A0010DBFA /* common */ = { - isa = PBXGroup; - children = ( - 50C374A819F04F7A00984F8D /* CFExtensions.m */, - 98AF92A3192ED60E009A8479 /* RAGameView.m */, - 98AF929D192ED5C4009A8479 /* utility.m */, - ); - path = common; - sourceTree = ""; - }; - 96355CE91788E72A0010DBFA /* Resources */ = { - isa = PBXGroup; - children = ( - 964DE7C617D84B57001CBB6C /* Settings.xib */, - C15874EE178F2094001171D4 /* RetroArch.icns */, - 967894911788ECDB00D6CA69 /* MainMenu.xib */, - 50BD3F101A1BBA6100F2BD1B /* RetroArch 10.6-Info.plist */, - 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */, - 9678948D1788ECCA00D6CA69 /* RetroArch-Info.plist */, - ); - name = Resources; - path = RetroArch; - sourceTree = ""; - }; - 98AF92AF192ED659009A8479 /* core */ = { - isa = PBXGroup; - children = ( - 98AF92B0192ED685009A8479 /* griffin.c */, - ); - name = core; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 50BD3EF11A1BBA6100F2BD1B /* RetroArch 10.6 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 50BD3F0C1A1BBA6100F2BD1B /* Build configuration list for PBXNativeTarget "RetroArch 10.6" */; - buildPhases = ( - 50BD3EF21A1BBA6100F2BD1B /* Sources */, - 50BD3EF91A1BBA6100F2BD1B /* Frameworks */, - 50BD3F061A1BBA6100F2BD1B /* Resources */, - 840A4D121A7CE9F90015C9CD /* CopyFiles */, - 840A4D1E1A7CF3F50015C9CD /* CopyFiles */, - 84F9A9881A7E3E02003AF12F /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "RetroArch 10.6"; - productName = RetroArch; - productReference = 50BD3F0F1A1BBA6100F2BD1B /* RetroArch 10.6.app */; - productType = "com.apple.product-type.application"; - }; - 96355CDE1788E72A0010DBFA /* RetroArch */ = { - isa = PBXNativeTarget; - buildConfigurationList = 96355CFA1788E72B0010DBFA /* Build configuration list for PBXNativeTarget "RetroArch" */; - buildPhases = ( - 96355CDB1788E72A0010DBFA /* Sources */, - 96355CDC1788E72A0010DBFA /* Frameworks */, - 96355CDD1788E72A0010DBFA /* Resources */, - 840A4D0F1A7CE77B0015C9CD /* CopyFiles */, - 840A4D1A1A7CF3290015C9CD /* CopyFiles */, - 84F9A97C1A7E3B6B003AF12F /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = RetroArch; - productName = RetroArch; - productReference = 96355CDF1788E72A0010DBFA /* RetroArch.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 96355CD51788E6E00010DBFA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0610; - }; - buildConfigurationList = 96355CD81788E6E00010DBFA /* Build configuration list for PBXProject "RetroArch_OSX" */; - compatibilityVersion = "Xcode 3.0"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 96355CD41788E6E00010DBFA; - productRefGroup = 96355CE01788E72A0010DBFA /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 96355CDE1788E72A0010DBFA /* RetroArch */, - 50BD3EF11A1BBA6100F2BD1B /* RetroArch 10.6 */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 50BD3F061A1BBA6100F2BD1B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50BD3F071A1BBA6100F2BD1B /* InfoPlist.strings in Resources */, - 50BD3F081A1BBA6100F2BD1B /* MainMenu.xib in Resources */, - 50BD3F0A1A1BBA6100F2BD1B /* RetroArch.icns in Resources */, - 50BD3F0B1A1BBA6100F2BD1B /* Settings.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 96355CDD1788E72A0010DBFA /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 967894931788ECDB00D6CA69 /* InfoPlist.strings in Resources */, - 967894941788ECDB00D6CA69 /* MainMenu.xib in Resources */, - C15874EF178F2094001171D4 /* RetroArch.icns in Resources */, - 964DE7C417D84B57001CBB6C /* Settings.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 50BD3EF21A1BBA6100F2BD1B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50BD3EF31A1BBA6100F2BD1B /* settings.m in Sources */, - 50BD3EF41A1BBA6100F2BD1B /* CFExtensions.m in Sources */, - 50BD3EF51A1BBA6100F2BD1B /* platform.m in Sources */, - 50BD3EF61A1BBA6100F2BD1B /* utility.m in Sources */, - 50BD3EF71A1BBA6100F2BD1B /* RAGameView.m in Sources */, - 50BD3EF81A1BBA6100F2BD1B /* griffin.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 96355CDB1788E72A0010DBFA /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50351E7D192E5E8900668AB1 /* settings.m in Sources */, - 50C374A919F04F7A00984F8D /* CFExtensions.m in Sources */, - 50351E7F192E5EC100668AB1 /* platform.m in Sources */, - 98AF929E192ED5C4009A8479 /* utility.m in Sources */, - 98AF92A4192ED60E009A8479 /* RAGameView.m in Sources */, - 98AF92B1192ED685009A8479 /* griffin.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 964DE7C617D84B57001CBB6C /* Settings.xib */ = { - isa = PBXVariantGroup; - children = ( - 964DE7C517D84B57001CBB6C /* en */, - ); - name = Settings.xib; - path = ../../Resources; - sourceTree = ""; - }; - 9678948F1788ECDB00D6CA69 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 967894901788ECDB00D6CA69 /* en */, - ); - name = InfoPlist.strings; - path = ../Resources; - sourceTree = ""; - }; - 967894911788ECDB00D6CA69 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 967894921788ECDB00D6CA69 /* en */, - ); - name = MainMenu.xib; - path = ../../Resources; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 50BD3F0D1A1BBA6100F2BD1B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; - CLANG_CXX_LIBRARY = "compiler-default"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/..", - "$(SRCROOT)/../../../gfx/inc", - "$(SRCROOT)/../../../libretro-sdk/include", - ); - INFOPLIST_FILE = "RetroArch 10.6-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( - "-DHAVE_GRIFFIN", - "-DHAVE_LOCATION", - "-DHAVE_RGUI", - "-DHAVE_MENU", - "-DOSX", - "-DHAVE_OPENGL", - "-DHAVE_FBO", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-D__LIBRETRO__", - "-DWANT_RPNG", - "-DHAVE_COREAUDIO", - "-DHAVE_DYNAMIC", - "-DHAVE_OVERLAY", - "-DHAVE_ZLIB", - "-DWANT_MINIZ", - "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", - "-DRARCH_INTERNAL", - "-DHAVE_THREADS", - "-DHAVE_DYLIB", - "-DHAVE_CG", - "-DHAVE_7ZIP", - "-DHAVE_GLUI", - "-DHAVE_HID", - "-DHAVE_XMB", - "-DHAVE_LIBRETRODB", - ); - PRODUCT_NAME = "RetroArch 10.6"; - SDKROOT = macosx; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - 50BD3F0E1A1BBA6100F2BD1B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; - CLANG_CXX_LIBRARY = "compiler-default"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/..", - "$(SRCROOT)/../../../gfx/inc", - "$(SRCROOT)/../../../libretro-sdk/include", - ); - INFOPLIST_FILE = "RetroArch 10.6-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( - "-DNS_BLOCK_ASSERTIONS=1", - "-DNDEBUG", - "-DHAVE_GRIFFIN", - "-DHAVE_LOCATION", - "-DHAVE_RGUI", - "-DHAVE_MENU", - "-DOSX", - "-DHAVE_OPENGL", - "-DHAVE_FBO", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-D__LIBRETRO__", - "-DWANT_RPNG", - "-DHAVE_COREAUDIO", - "-DHAVE_DYNAMIC", - "-DHAVE_OVERLAY", - "-DHAVE_ZLIB", - "-DWANT_MINIZ", - "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", - "-DRARCH_INTERNAL", - "-DHAVE_THREADS", - "-DHAVE_DYLIB", - "-DHAVE_CG", - "-DHAVE_7ZIP", - "-DHAVE_GLUI", - "-DHAVE_HID", - "-DHAVE_XMB", - "-DHAVE_LIBRETRODB", - ); - PRODUCT_NAME = "RetroArch 10.6"; - SDKROOT = macosx; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; - 96355CD91788E6E00010DBFA /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_WARN_ASSIGN_ENUM = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/.."; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - }; - name = Debug; - }; - 96355CDA1788E6E00010DBFA /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_WARN_ASSIGN_ENUM = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/.."; - MACOSX_DEPLOYMENT_TARGET = 10.5; - }; - name = Release; - }; - 96355CFB1788E72B0010DBFA /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; - CLANG_CXX_LIBRARY = "compiler-default"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/..", - "$(SRCROOT)/../../../gfx/inc", - "$(SRCROOT)/../../../libretro-sdk/include", - ); - INFOPLIST_FILE = "$(SRCROOT)/RetroArch-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( - "-DHAVE_GRIFFIN", - "-DHAVE_LOCATION", - "-DHAVE_RGUI", - "-DHAVE_MENU", - "-DOSX", - "-DHAVE_OPENGL", - "-DHAVE_FBO", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-D__LIBRETRO__", - "-DWANT_RPNG", - "-DHAVE_COREAUDIO", - "-DHAVE_DYNAMIC", - "-DHAVE_OVERLAY", - "-DHAVE_ZLIB", - "-DWANT_MINIZ", - "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", - "-DRARCH_INTERNAL", - "-DHAVE_THREADS", - "-DHAVE_DYLIB", - "-DHAVE_CG", - "-DHAVE_7ZIP", - "-DHAVE_GLUI", - "-DHAVE_HID", - "-DHAVE_XMB", - "-DHAVE_LIBRETRODB", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - 96355CFC1788E72B0010DBFA /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; - CLANG_CXX_LIBRARY = "compiler-default"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/..", - "$(SRCROOT)/../../../gfx/inc", - "$(SRCROOT)/../../../libretro-sdk/include", - ); - INFOPLIST_FILE = "$(SRCROOT)/RetroArch-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( - "-DNS_BLOCK_ASSERTIONS=1", - "-DNDEBUG", - "-DHAVE_GRIFFIN", - "-DHAVE_LOCATION", - "-DHAVE_RGUI", - "-DHAVE_MENU", - "-DOSX", - "-DHAVE_OPENGL", - "-DHAVE_FBO", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-D__LIBRETRO__", - "-DWANT_RPNG", - "-DHAVE_COREAUDIO", - "-DHAVE_DYNAMIC", - "-DHAVE_OVERLAY", - "-DHAVE_ZLIB", - "-DWANT_MINIZ", - "-DSINC_LOWER_QUALITY", - "-DHAVE_NETPLAY", - "-DHAVE_NETWORKING", - "-DRARCH_INTERNAL", - "-DHAVE_THREADS", - "-DHAVE_DYLIB", - "-DHAVE_CG", - "-DHAVE_7ZIP", - "-DHAVE_GLUI", - "-DHAVE_HID", - "-DHAVE_XMB", - "-DHAVE_LIBRETRODB", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 50BD3F0C1A1BBA6100F2BD1B /* Build configuration list for PBXNativeTarget "RetroArch 10.6" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 50BD3F0D1A1BBA6100F2BD1B /* Debug */, - 50BD3F0E1A1BBA6100F2BD1B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 96355CD81788E6E00010DBFA /* Build configuration list for PBXProject "RetroArch_OSX" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 96355CD91788E6E00010DBFA /* Debug */, - 96355CDA1788E6E00010DBFA /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 96355CFA1788E72B0010DBFA /* Build configuration list for PBXNativeTarget "RetroArch" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 96355CFB1788E72B0010DBFA /* Debug */, - 96355CFC1788E72B0010DBFA /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 96355CD51788E6E00010DBFA /* Project object */; -} 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 deleted file mode 100644 index 37a0bd96a0..0000000000 --- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout +++ /dev/null @@ -1,121 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 68627F4F-2F04-453A-B5AC-5C4A2718C870 - IDESourceControlProjectName - RetroArch_OSX - IDESourceControlProjectOriginsDictionary - - 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 - https://github.com/libretro/common-shaders.git - 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD - https://github.com/libretro/retroarch-joypad-autoconfig.git - 76200F0D6584D865E96F58DE862E738E88B23A3C - https://github.com/libretro/libretro-super.git - A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 - https://github.com/libretro/retroarch-assets.git - C3AEE01BDA902108663DB5DB9CD7916436919463 - https://github.com/libretro/libretro-database.git - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - https://github.com/libretro/RetroArch.git - EF363D58F01B3FB341FA6C851870E60E4F080E97 - https://github.com/libretro/common-overlays.git - - IDESourceControlProjectPath - apple/OSX/OSX/RetroArch_OSX.xcodeproj - IDESourceControlProjectRelativeInstallPathDictionary - - 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 - ../../../../../media/shaders_cg - 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD - ../../../../../media/autoconfig - 76200F0D6584D865E96F58DE862E738E88B23A3C - ../../../../../.. - A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 - ../../../../../media/assets - C3AEE01BDA902108663DB5DB9CD7916436919463 - ../../../../../media/libretrodb - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - ../../../../.. - EF363D58F01B3FB341FA6C851870E60E4F080E97 - ../../../../../media/overlays - - IDESourceControlProjectURL - https://github.com/libretro/RetroArch.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 76200F0D6584D865E96F58DE862E738E88B23A3C - IDESourceControlWCCName - - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 - IDESourceControlWCCName - assets - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 - IDESourceControlWCCName - assets - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD - IDESourceControlWCCName - autoconfig - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - C3AEE01BDA902108663DB5DB9CD7916436919463 - IDESourceControlWCCName - libretrodb - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - EF363D58F01B3FB341FA6C851870E60E4F080E97 - IDESourceControlWCCName - overlays - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 - IDESourceControlWCCName - retroarch - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 - IDESourceControlWCCName - shaders_cg - - - - diff --git a/apple/OSX/Resources/RetroArch-Info.plist b/apple/OSX/RetroArch-Info.plist similarity index 100% rename from apple/OSX/Resources/RetroArch-Info.plist rename to apple/OSX/RetroArch-Info.plist diff --git a/apple/OSX/Resources/en.lproj/InfoPlist.strings b/apple/OSX/en.lproj/InfoPlist.strings similarity index 100% rename from apple/OSX/Resources/en.lproj/InfoPlist.strings rename to apple/OSX/en.lproj/InfoPlist.strings diff --git a/apple/OSX/Resources/en.lproj/MainMenu.xib b/apple/OSX/en.lproj/MainMenu.xib similarity index 100% rename from apple/OSX/Resources/en.lproj/MainMenu.xib rename to apple/OSX/en.lproj/MainMenu.xib diff --git a/apple/OSX/Resources/en.lproj/Settings.xib b/apple/OSX/en.lproj/Settings.xib similarity index 100% rename from apple/OSX/Resources/en.lproj/Settings.xib rename to apple/OSX/en.lproj/Settings.xib diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..5467eff60b --- /dev/null +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -0,0 +1,440 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 45; + objects = { + +/* Begin PBXBuildFile section */ + 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; + 840222F51A889DE9009AB261 /* CFExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F41A889DE9009AB261 /* CFExtensions.m */; }; + 840222F71A889DFC009AB261 /* RAGameView.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F61A889DFC009AB261 /* RAGameView.m */; }; + 840222F91A889E0C009AB261 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F81A889E0C009AB261 /* utility.m */; }; + 840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; }; + 840365B51A88960400C51FB4 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 840365B41A88960400C51FB4 /* settings.m */; }; + 84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */; }; + 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; + 84DD5EA51A89E2F6007336C1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */; }; + 84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA61A89E406007336C1 /* CoreLocation.framework */; }; + 84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */; }; + 84DD5EAB1A89E534007336C1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */; }; + 84DD5EAD1A89E5B4007336C1 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EAC1A89E5B4007336C1 /* OpenGL.framework */; }; + 84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */; }; + 84DD5EB51A89E737007336C1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB41A89E737007336C1 /* IOKit.framework */; }; + 84DD5EB61A89E76C007336C1 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB01A89E664007336C1 /* Cg.framework */; }; + 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; + 8D11072D0486CEB800E47090 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* platform.m */; settings = {ATTRIBUTES = (); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = ""; }; + 1DDD58150DA1D0A300B32029 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = OSX/en.lproj/MainMenu.xib; sourceTree = ""; }; + 29B97316FDCFA39411CA2CEA /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = platform.m; path = OSX/platform.m; sourceTree = ""; }; + 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 840222F41A889DE9009AB261 /* CFExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = common/CFExtensions.m; sourceTree = ""; }; + 840222F61A889DFC009AB261 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = common/RAGameView.m; sourceTree = ""; }; + 840222F81A889E0C009AB261 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = common/utility.m; sourceTree = ""; }; + 840222FB1A889EE2009AB261 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; + 840365B41A88960400C51FB4 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = OSX/settings.m; sourceTree = ""; }; + 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; + 84DD5EA11A89658D007336C1 /* RetroArch_Apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RetroArch_Apple.h; path = common/RetroArch_Apple.h; sourceTree = ""; }; + 84DD5EA21A896816007336C1 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = OSX/platform.h; sourceTree = ""; }; + 84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = /System/Library/Frameworks/AVFoundation.framework; sourceTree = ""; }; + 84DD5EA61A89E406007336C1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = ""; }; + 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; + 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = /System/Library/Frameworks/CoreMedia.framework; sourceTree = ""; }; + 84DD5EAC1A89E5B4007336C1 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; + 84DD5EB01A89E664007336C1 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = /Library/Frameworks/Cg.framework; sourceTree = ""; }; + 84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; + 84DD5EB41A89E737007336C1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + 8D1107310486CEB800E47090 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "OSX/RetroArch-Info.plist"; sourceTree = ""; }; + 8D1107320486CEB800E47090 /* RetroArch_OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch_OSX.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8D11072E0486CEB800E47090 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 84DD5EA91A89E4BE007336C1 /* CoreAudio.framework in Frameworks */, + 84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */, + 84DD5EB61A89E76C007336C1 /* Cg.framework in Frameworks */, + 84DD5EAD1A89E5B4007336C1 /* OpenGL.framework in Frameworks */, + 84DD5EA51A89E2F6007336C1 /* AVFoundation.framework in Frameworks */, + 84DD5EA71A89E406007336C1 /* CoreLocation.framework in Frameworks */, + 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */, + 84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */, + 84DD5EAB1A89E534007336C1 /* CoreMedia.framework in Frameworks */, + 84DD5EB51A89E737007336C1 /* IOKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 080E96DDFE201D6D7F000001 /* Classes */ = { + isa = PBXGroup; + children = ( + ); + name = Classes; + sourceTree = ""; + }; + 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { + isa = PBXGroup; + children = ( + 84DD5EB41A89E737007336C1 /* IOKit.framework */, + 84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */, + 84DD5EB01A89E664007336C1 /* Cg.framework */, + 84DD5EAC1A89E5B4007336C1 /* OpenGL.framework */, + 84DD5EAA1A89E534007336C1 /* CoreMedia.framework */, + 84DD5EA81A89E4BE007336C1 /* CoreAudio.framework */, + 84DD5EA61A89E406007336C1 /* CoreLocation.framework */, + 84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */, + 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */, + 29B97324FDCFA39411CA2CEA /* AppKit.framework */, + ); + name = "Linked Frameworks"; + sourceTree = ""; + }; + 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = "Other Frameworks"; + sourceTree = ""; + }; + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D1107320486CEB800E47090 /* RetroArch_OSX.app */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* RetroArch_OSX */ = { + isa = PBXGroup; + children = ( + 840222FA1A889EA2009AB261 /* Core */, + 840222F21A889D62009AB261 /* Common */, + 84F678D51A889446000C8F9C /* OSX */, + 080E96DDFE201D6D7F000001 /* Classes */, + 29B97315FDCFA39411CA2CEA /* Other Sources */, + 29B97317FDCFA39411CA2CEA /* Resources */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 19C28FACFE9D520D11CA2CBB /* Products */, + ); + indentWidth = 3; + name = RetroArch_OSX; + sourceTree = ""; + tabWidth = 3; + wrapsLines = 0; + }; + 29B97315FDCFA39411CA2CEA /* Other Sources */ = { + isa = PBXGroup; + children = ( + ); + name = "Other Sources"; + sourceTree = ""; + }; + 29B97317FDCFA39411CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + 8D1107310486CEB800E47090 /* RetroArch-Info.plist */, + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, + 1DDD58140DA1D0A300B32029 /* MainMenu.xib */, + ); + name = Resources; + sourceTree = ""; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, + 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, + ); + name = Frameworks; + sourceTree = ""; + }; + 840222F21A889D62009AB261 /* Common */ = { + isa = PBXGroup; + children = ( + 84DD5EA11A89658D007336C1 /* RetroArch_Apple.h */, + 840222F41A889DE9009AB261 /* CFExtensions.m */, + 840222F61A889DFC009AB261 /* RAGameView.m */, + 840222F81A889E0C009AB261 /* utility.m */, + ); + name = Common; + sourceTree = ""; + }; + 840222FA1A889EA2009AB261 /* Core */ = { + isa = PBXGroup; + children = ( + 840222FB1A889EE2009AB261 /* griffin.c */, + ); + name = Core; + sourceTree = ""; + }; + 84F678D51A889446000C8F9C /* OSX */ = { + isa = PBXGroup; + children = ( + 84DD5EA21A896816007336C1 /* platform.h */, + 840365B41A88960400C51FB4 /* settings.m */, + 29B97316FDCFA39411CA2CEA /* platform.m */, + ); + name = OSX; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8D1107260486CEB800E47090 /* RetroArch_OSX */ = { + isa = PBXNativeTarget; + buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "RetroArch_OSX" */; + buildPhases = ( + 8D1107290486CEB800E47090 /* Resources */, + 8D11072C0486CEB800E47090 /* Sources */, + 8D11072E0486CEB800E47090 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = RetroArch_OSX; + productInstallPath = "$(HOME)/Applications"; + productName = RetroArch_OSX; + productReference = 8D1107320486CEB800E47090 /* RetroArch_OSX.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + }; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX" */; + compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + en, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* RetroArch_OSX */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D1107260486CEB800E47090 /* RetroArch_OSX */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D1107290486CEB800E47090 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, + 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8D11072C0486CEB800E47090 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D11072D0486CEB800E47090 /* platform.m in Sources */, + 840365B51A88960400C51FB4 /* settings.m in Sources */, + 840222F51A889DE9009AB261 /* CFExtensions.m in Sources */, + 840222F71A889DFC009AB261 /* RAGameView.m in Sources */, + 840222F91A889E0C009AB261 /* utility.m in Sources */, + 840222FC1A889EE2009AB261 /* griffin.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C165DFE840E0CC02AAC07 /* InfoPlist.strings */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 1DDD58150DA1D0A300B32029 /* MainMenu.xib */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + C01FCF4B08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/..", + "$(SRCROOT)/../gfx/inc", + "$(SRCROOT)/../libretro-sdk/include", + ); + INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CFLAGS = ( + "-DHAVE_GRIFFIN", + "-DHAVE_LOCATION", + "-DHAVE_RGUI", + "-DHAVE_MENU", + "-DOSX", + "-DHAVE_OPENGL", + "-DHAVE_FBO", + "-DHAVE_GLSL", + "-DINLINE=inline", + "-D__LIBRETRO__", + "-DWANT_RPNG", + "-DHAVE_COREAUDIO", + "-DHAVE_DYNAMIC", + "-DHAVE_OVERLAY", + "-DHAVE_ZLIB", + "-DWANT_MINIZ", + "-DSINC_LOWER_QUALITY", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", + "-DRARCH_INTERNAL", + "-DHAVE_THREADS", + "-DHAVE_DYLIB", + "-DHAVE_CG", + "-DHAVE_7ZIP", + "-DHAVE_GLUI", + "-DHAVE_HID", + "-DHAVE_XMB", + "-DHAVE_LIBRETRODB", + ); + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; + PRODUCT_NAME = RetroArch_OSX; + }; + name = Debug; + }; + C01FCF4C08A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/..", + "$(SRCROOT)/../gfx/inc", + "$(SRCROOT)/../libretro-sdk/include", + ); + INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = 10.5; + OTHER_CFLAGS = ( + "-DHAVE_GRIFFIN", + "-DHAVE_LOCATION", + "-DHAVE_RGUI", + "-DHAVE_MENU", + "-DOSX", + "-DHAVE_OPENGL", + "-DHAVE_FBO", + "-DHAVE_GLSL", + "-DINLINE=inline", + "-D__LIBRETRO__", + "-DWANT_RPNG", + "-DHAVE_COREAUDIO", + "-DHAVE_DYNAMIC", + "-DHAVE_OVERLAY", + "-DHAVE_ZLIB", + "-DWANT_MINIZ", + "-DSINC_LOWER_QUALITY", + "-DHAVE_NETPLAY", + "-DHAVE_NETWORKING", + "-DRARCH_INTERNAL", + "-DHAVE_THREADS", + "-DHAVE_DYLIB", + "-DHAVE_CG", + "-DHAVE_7ZIP", + "-DHAVE_GLUI", + "-DHAVE_HID", + "-DHAVE_XMB", + "-DHAVE_LIBRETRODB", + ); + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; + PRODUCT_NAME = RetroArch_OSX; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = NO; + PREBINDING = NO; + SDKROOT = ""; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + PREBINDING = NO; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "RetroArch_OSX" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4B08A954540054247B /* Debug */, + C01FCF4C08A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to apple/RetroArch_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout b/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout new file mode 100644 index 0000000000..8fda8a9fd2 --- /dev/null +++ b/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout @@ -0,0 +1,53 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 6707FA08-D738-4E96-838A-767375E3B767 + IDESourceControlProjectName + RetroArch_OSX + IDESourceControlProjectOriginsDictionary + + 76200F0D6584D865E96F58DE862E738E88B23A3C + https://github.com/libretro/libretro-super.git + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + https://github.com/libretro/RetroArch.git + + IDESourceControlProjectPath + apple/RetroArch_OSX.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + 76200F0D6584D865E96F58DE862E738E88B23A3C + ../../../.. + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + ../../.. + + IDESourceControlProjectURL + https://github.com/libretro/RetroArch.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 76200F0D6584D865E96F58DE862E738E88B23A3C + IDESourceControlWCCName + + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 + IDESourceControlWCCName + retroarch + + + + diff --git a/apple/common/utility.m b/apple/common/utility.m index 8610da2846..c187f6135e 100644 --- a/apple/common/utility.m +++ b/apple/common/utility.m @@ -18,6 +18,8 @@ #include "RetroArch_Apple.h" #include "../../settings_data.h" +#import + void apple_display_alert(const char *message, const char *title) { #ifdef IOS diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout index 480a41060d..b994bee2dc 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout @@ -56,14 +56,6 @@ IDESourceControlWCCName - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 76200F0D6584D865E96F58DE862E738E88B23A3C - IDESourceControlWCCName - - IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git From b14cc6a635be2c5b38b76264ba5c1dd1df45a4a3 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Mon, 9 Feb 2015 23:53:42 -0800 Subject: [PATCH 2/6] fetch-submodules script for RA --- fetch-submodules.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100755 fetch-submodules.sh diff --git a/fetch-submodules.sh b/fetch-submodules.sh new file mode 100755 index 0000000000..6c29820295 --- /dev/null +++ b/fetch-submodules.sh @@ -0,0 +1,59 @@ +#! /usr/bin/env bash +# vim: set ts=3 sw=3 noet ft=sh : bash + +SCRIPT="${0#./}" +BASE_DIR="${SCRIPT%/*}" +WORKDIR=$(pwd) + +if [ "$BASE_DIR" = "$SCRIPT" ]; then + BASE_DIR="$WORKDIR" +else + BASE_DIR="$WORKDIR/$BASE_DIR" +fi + +WORKDIR=$(pwd) + +echo_cmd() { + echo "$@" + "$@" +} + + +# A stripped-down version of the fetch_git rule from libretro-super +# Clones or pulls updates from a git repository into a local directory +# +# $1 The URI to fetch +# $2 The local directory to fetch to (relative) +fetch_git() { + fetch_dir="$WORKDIR/$2" + if [ -d "$fetch_dir/.git" ]; then + echo_cmd git -C "$fetch_dir" pull + else + echo_cmd git clone "$1" "$fetch_dir" + fi +} + +echo "Fetching RetroArch's submodules..." +fetch_git "https://github.com/libretro/common-shaders.git" "media/shaders_cg" +fetch_git "https://github.com/libretro/common-overlays.git" "media/overlays" +fetch_git "https://github.com/libretro/retroarch-assets.git" "media/assets" +fetch_git "https://github.com/libretro/retroarch-joypad-autoconfig.git" "media/autoconfig" +fetch_git "https://github.com/libretro/libretro-database.git" "media/libretrodb" + +# FIXME: This entire script should be unnecessary. It exists because we don't +# use git submodules in libretro/RetroArch, which introduces one of three +# possible build dependencies: +# +# 1. The user is using libretro-super. But libretro-super is not supposed to +# be required because "no dependencies!" +# +# 2. Unreasonable expectations of the user: That they are deeply versed in the +# changing inner workings of a massively-multi-platform project with dozens +# of modules and submodules, or that they are somehow psychic. +# +# 3. The user has a script which cannot depend on libretro-super to fetch the +# submodules for them. This is it. +# +# The third choice is the path of least resistance, but the correct solution +# is to fix the submodules issue. + From 4ac5919d68700a4dacd17c66ce2b879be2d17084 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 10 Feb 2015 00:09:27 -0800 Subject: [PATCH 3/6] Give retroarch an icon in new OSX project --- apple/OSX/RetroArch-Info.plist | 2 +- apple/RetroArch_OSX.xcodeproj/project.pbxproj | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apple/OSX/RetroArch-Info.plist b/apple/OSX/RetroArch-Info.plist index 85b0b396c7..68ef9c4829 100644 --- a/apple/OSX/RetroArch-Info.plist +++ b/apple/OSX/RetroArch-Info.plist @@ -20,7 +20,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - RetroArch + retroarch CFBundleIdentifier libretro.${PRODUCT_NAME:rfc1034identifier} CFBundleInfoDictionaryVersion diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index 5467eff60b..a59a9d072b 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -23,6 +23,7 @@ 84DD5EB31A89E6C0007336C1 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */; }; 84DD5EB51A89E737007336C1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB41A89E737007336C1 /* IOKit.framework */; }; 84DD5EB61A89E76C007336C1 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB01A89E664007336C1 /* Cg.framework */; }; + 84DD5EB81A89F1C7007336C1 /* retroarch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 84DD5EB71A89F1C7007336C1 /* retroarch.icns */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* platform.m */; settings = {ATTRIBUTES = (); }; }; /* End PBXBuildFile section */ @@ -48,6 +49,7 @@ 84DD5EB01A89E664007336C1 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = /Library/Frameworks/Cg.framework; sourceTree = ""; }; 84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 84DD5EB41A89E737007336C1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + 84DD5EB71A89F1C7007336C1 /* retroarch.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = retroarch.icns; path = ../media/retroarch.icns; sourceTree = ""; }; 8D1107310486CEB800E47090 /* RetroArch-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "RetroArch-Info.plist"; path = "OSX/RetroArch-Info.plist"; sourceTree = ""; }; 8D1107320486CEB800E47090 /* RetroArch_OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch_OSX.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -140,6 +142,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 84DD5EB71A89F1C7007336C1 /* retroarch.icns */, 8D1107310486CEB800E47090 /* RetroArch-Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 1DDD58140DA1D0A300B32029 /* MainMenu.xib */, @@ -211,11 +214,8 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; - attributes = { - }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX" */; compatibilityVersion = "Xcode 3.1"; - developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( en, @@ -236,6 +236,7 @@ files = ( 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, + 84DD5EB81A89F1C7007336C1 /* retroarch.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From f294dec7768181ae0ac97271f0b3a0e1e844c537 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 10 Feb 2015 00:10:51 -0800 Subject: [PATCH 4/6] How many copies of this do we need? Just one. --- apple/OSX/Resources/RetroArch.icns | Bin 66653 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 apple/OSX/Resources/RetroArch.icns diff --git a/apple/OSX/Resources/RetroArch.icns b/apple/OSX/Resources/RetroArch.icns deleted file mode 100644 index 56bbbc64ab4b6a09bf08dcb1526a6b4feaf948de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66653 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 From 4bcaf4055172c4245b86bf039947f117f2c3df8d Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 10 Feb 2015 05:34:28 -0800 Subject: [PATCH 5/6] New project file should work. xmb still doesn't --- apple/RetroArch_OSX.xcodeproj/project.pbxproj | 80 ++++++++++++++++++- .../xcshareddata/RetroArch_OSX.xccheckout | 60 ++++++++++++++ frontend/drivers/platform_apple.c | 12 +-- 3 files changed, 142 insertions(+), 10 deletions(-) diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index a59a9d072b..02dbb4d024 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -13,6 +13,13 @@ 840222F91A889E0C009AB261 /* utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 840222F81A889E0C009AB261 /* utility.m */; }; 840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; }; 840365B51A88960400C51FB4 /* settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 840365B41A88960400C51FB4 /* settings.m */; }; + 841CBB881A8A343E0066E9F1 /* rdb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7F1A8A31650066E9F1 /* rdb */; }; + 841CBB891A8A34420066E9F1 /* cursors in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7D1A8A314F0066E9F1 /* cursors */; }; + 841CBB8A1A8A34470066E9F1 /* cht in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB7B1A8A31370066E9F1 /* cht */; }; + 841CBB8B1A8A347C0066E9F1 /* shaders_cg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB791A8A311C0066E9F1 /* shaders_cg */; }; + 841CBB8C1A8A34810066E9F1 /* overlays in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB771A8A30F00066E9F1 /* overlays */; }; + 841CBB8D1A8A348B0066E9F1 /* autoconfig in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB751A8A30CC0066E9F1 /* autoconfig */; }; + 841CBB8E1A8A34920066E9F1 /* assets in CopyFiles */ = {isa = PBXBuildFile; fileRef = 841CBB731A8A308C0066E9F1 /* assets */; }; 84DD5E9F1A88E45B007336C1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */; }; 84DD5EA31A89E2AA007336C1 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; }; 84DD5EA51A89E2F6007336C1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EA41A89E2F6007336C1 /* AVFoundation.framework */; }; @@ -28,6 +35,34 @@ 8D11072D0486CEB800E47090 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* platform.m */; settings = {ATTRIBUTES = (); }; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + 841CBB831A8A33B60066E9F1 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + 841CBB8E1A8A34920066E9F1 /* assets in CopyFiles */, + 841CBB8D1A8A348B0066E9F1 /* autoconfig in CopyFiles */, + 841CBB8C1A8A34810066E9F1 /* overlays in CopyFiles */, + 841CBB8B1A8A347C0066E9F1 /* shaders_cg in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 841CBB871A8A34330066E9F1 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + 841CBB8A1A8A34470066E9F1 /* cht in CopyFiles */, + 841CBB891A8A34420066E9F1 /* cursors in CopyFiles */, + 841CBB881A8A343E0066E9F1 /* rdb in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = ""; }; 1DDD58150DA1D0A300B32029 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = OSX/en.lproj/MainMenu.xib; sourceTree = ""; }; @@ -38,6 +73,13 @@ 840222F81A889E0C009AB261 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = common/utility.m; sourceTree = ""; }; 840222FB1A889EE2009AB261 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; 840365B41A88960400C51FB4 /* settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = settings.m; path = OSX/settings.m; sourceTree = ""; }; + 841CBB731A8A308C0066E9F1 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../media/assets; sourceTree = ""; }; + 841CBB751A8A30CC0066E9F1 /* autoconfig */ = {isa = PBXFileReference; lastKnownFileType = folder; name = autoconfig; path = ../media/autoconfig; sourceTree = ""; }; + 841CBB771A8A30F00066E9F1 /* overlays */ = {isa = PBXFileReference; lastKnownFileType = folder; name = overlays; path = ../media/overlays; sourceTree = ""; }; + 841CBB791A8A311C0066E9F1 /* shaders_cg */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders_cg; path = ../media/shaders_cg; sourceTree = ""; }; + 841CBB7B1A8A31370066E9F1 /* cht */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cht; path = ../media/libretrodb/cht; sourceTree = ""; }; + 841CBB7D1A8A314F0066E9F1 /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cursors; path = ../media/libretrodb/cursors; sourceTree = ""; }; + 841CBB7F1A8A31650066E9F1 /* rdb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rdb; path = ../media/libretrodb/rdb; sourceTree = ""; }; 84DD5E9E1A88E45B007336C1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; 84DD5EA11A89658D007336C1 /* RetroArch_Apple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RetroArch_Apple.h; path = common/RetroArch_Apple.h; sourceTree = ""; }; 84DD5EA21A896816007336C1 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = OSX/platform.h; sourceTree = ""; }; @@ -122,6 +164,7 @@ 84F678D51A889446000C8F9C /* OSX */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, + 841CBB821A8A33810066E9F1 /* Assets */, 29B97317FDCFA39411CA2CEA /* Resources */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, @@ -178,6 +221,28 @@ name = Core; sourceTree = ""; }; + 841CBB811A8A33640066E9F1 /* libretrodb */ = { + isa = PBXGroup; + children = ( + 841CBB7B1A8A31370066E9F1 /* cht */, + 841CBB7D1A8A314F0066E9F1 /* cursors */, + 841CBB7F1A8A31650066E9F1 /* rdb */, + ); + name = libretrodb; + sourceTree = ""; + }; + 841CBB821A8A33810066E9F1 /* Assets */ = { + isa = PBXGroup; + children = ( + 841CBB731A8A308C0066E9F1 /* assets */, + 841CBB751A8A30CC0066E9F1 /* autoconfig */, + 841CBB771A8A30F00066E9F1 /* overlays */, + 841CBB791A8A311C0066E9F1 /* shaders_cg */, + 841CBB811A8A33640066E9F1 /* libretrodb */, + ); + name = Assets; + sourceTree = ""; + }; 84F678D51A889446000C8F9C /* OSX */ = { isa = PBXGroup; children = ( @@ -198,6 +263,8 @@ 8D1107290486CEB800E47090 /* Resources */, 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, + 841CBB831A8A33B60066E9F1 /* CopyFiles */, + 841CBB871A8A34330066E9F1 /* CopyFiles */, ); buildRules = ( ); @@ -214,8 +281,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( en, @@ -396,9 +466,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.5; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - SDKROOT = ""; + SDKROOT = macosx; }; name = Debug; }; @@ -409,8 +480,9 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.5; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk"; + SDKROOT = macosx; }; name = Release; }; @@ -424,7 +496,7 @@ C01FCF4C08A954540054247B /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RetroArch_OSX" */ = { isa = XCConfigurationList; @@ -433,7 +505,7 @@ C01FCF5008A954540054247B /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout b/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout index 8fda8a9fd2..78d97fd5bd 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout +++ b/apple/RetroArch_OSX.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_OSX.xccheckout @@ -10,19 +10,39 @@ RetroArch_OSX IDESourceControlProjectOriginsDictionary + 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 + https://github.com/libretro/common-shaders.git + 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD + https://github.com/libretro/retroarch-joypad-autoconfig.git 76200F0D6584D865E96F58DE862E738E88B23A3C https://github.com/libretro/libretro-super.git + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + https://github.com/libretro/retroarch-assets.git + C3AEE01BDA902108663DB5DB9CD7916436919463 + https://github.com/libretro/libretro-database.git C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 https://github.com/libretro/RetroArch.git + EF363D58F01B3FB341FA6C851870E60E4F080E97 + https://github.com/libretro/common-overlays.git IDESourceControlProjectPath apple/RetroArch_OSX.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary + 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 + ../../../media/shaders_cg + 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD + ../../../media/autoconfig 76200F0D6584D865E96F58DE862E738E88B23A3C ../../../.. + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + ../../../media/assets + C3AEE01BDA902108663DB5DB9CD7916436919463 + ../../../media/libretrodb C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 ../../.. + EF363D58F01B3FB341FA6C851870E60E4F080E97 + ../../../media/overlays IDESourceControlProjectURL https://github.com/libretro/RetroArch.git @@ -40,6 +60,38 @@ IDESourceControlWCCName + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6 + IDESourceControlWCCName + assets + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6B9F0B13E5864452B91F13C09B7ED9EB989E82AD + IDESourceControlWCCName + autoconfig + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + C3AEE01BDA902108663DB5DB9CD7916436919463 + IDESourceControlWCCName + libretrodb + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + EF363D58F01B3FB341FA6C851870E60E4F080E97 + IDESourceControlWCCName + overlays + IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git @@ -48,6 +100,14 @@ IDESourceControlWCCName retroarch + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 66A80EF91DB414BA5E941825F216CCE8F40CCCF2 + IDESourceControlWCCName + shaders_cg + diff --git a/frontend/drivers/platform_apple.c b/frontend/drivers/platform_apple.c index 50be22722c..d649378018 100644 --- a/frontend/drivers/platform_apple.c +++ b/frontend/drivers/platform_apple.c @@ -183,12 +183,12 @@ static void frontend_apple_get_environment_settings(int *argc, char *argv[], * * Ideas: There's some overlap here with how the Android APK has to extract all its resource files over to the actual sandboxed * app dir, maybe try to create something standardized for both platforms (OSX/Android) */ - fill_pathname_join(g_defaults.overlay_dir, bundle_path_buf, "Contents/Resources/modules/overlays", sizeof(g_defaults.overlay_dir)); - fill_pathname_join(g_defaults.autoconfig_dir, bundle_path_buf, "Contents/Resources/modules/autoconfig/apple", sizeof(g_defaults.autoconfig_dir)); - fill_pathname_join(g_defaults.assets_dir, bundle_path_buf, "Contents/Resources/modules/assets", sizeof(g_defaults.assets_dir)); - fill_pathname_join(g_defaults.shader_dir, bundle_path_buf, "Contents/Resources/modules/shaders", sizeof(g_defaults.shader_dir)); - fill_pathname_join(g_defaults.audio_filter_dir, bundle_path_buf, "Contents/Resources/modules/audio_filters", sizeof(g_defaults.audio_filter_dir)); - fill_pathname_join(g_defaults.video_filter_dir, bundle_path_buf, "Contents/Resources/modules/video_filters", sizeof(g_defaults.video_filter_dir)); + fill_pathname_join(g_defaults.overlay_dir, bundle_path_buf, "Contents/Resources/overlays", sizeof(g_defaults.overlay_dir)); + fill_pathname_join(g_defaults.autoconfig_dir, bundle_path_buf, "Contents/Resources/autoconfig/apple", sizeof(g_defaults.autoconfig_dir)); + fill_pathname_join(g_defaults.assets_dir, bundle_path_buf, "Contents/Resources/assets", sizeof(g_defaults.assets_dir)); + fill_pathname_join(g_defaults.shader_dir, bundle_path_buf, "Contents/Resources/shaders", sizeof(g_defaults.shader_dir)); + fill_pathname_join(g_defaults.audio_filter_dir, bundle_path_buf, "Contents/Resources/audio_filters", sizeof(g_defaults.audio_filter_dir)); + fill_pathname_join(g_defaults.video_filter_dir, bundle_path_buf, "Contents/Resources/video_filters", sizeof(g_defaults.video_filter_dir)); fill_pathname_join(g_defaults.menu_config_dir, support_path_buf, "RetroArch", sizeof(g_defaults.menu_config_dir)); fill_pathname_join(g_defaults.config_path, g_defaults.menu_config_dir, "retroarch.cfg", sizeof(g_defaults.config_path)); #endif From a5028cab03a120f9f4364b5cadea52bdb827583e Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Tue, 10 Feb 2015 07:31:19 -0800 Subject: [PATCH 6/6] Merge kivutar's menu fix for xmb --- menu/drivers/xmb.c | 25 +++++++++---------------- menu/menu_driver.h | 1 + menu/menu_entries_cbs.c | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index a9175b042b..5b241c446f 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -88,7 +88,6 @@ typedef struct xmb_handle size_t selection_ptr_old; int active_category; int active_category_old; - int num_categories; int depth; int old_depth; char icon_dir[4]; @@ -775,7 +774,7 @@ static void xmb_list_open(void) xmb->active_category += dir; - for (j = 0; j < xmb->num_categories; j++) + for (j = 0; j < driver.menu->num_categories; j++) { float ia = xmb->c_passive_alpha; float iz = xmb->c_passive_zoom; @@ -822,7 +821,7 @@ static void xmb_list_switch(void) else if (xmb->depth < xmb->old_depth) dir = -1; - for (j = 0; j < xmb->num_categories; j++) + for (j = 0; j < driver.menu->num_categories; j++) { float ia = 0; xmb_node_t *node = j ? xmb_node_for_core(j-1) : &xmb->settings_node; @@ -1116,7 +1115,7 @@ static void xmb_frame(void) driver.menu->selection_ptr, driver.menu->cat_selection_ptr); - for (i = 0; i < xmb->num_categories; i++) + for (i = 0; i < driver.menu->num_categories; i++) { xmb_node_t *node = i ? xmb_node_for_core(i-1) : &xmb->settings_node; @@ -1258,15 +1257,9 @@ static void *xmb_init(void) xmb->label_margin_top = xmb->font_size/3.0; xmb->setting_margin_left = 600.0 * scale_factor; - xmb->num_categories = 1; - - if (!g_extern.core_info) - { - RARCH_ERR("Global core informations not initialized.\n"); - goto error; - } - - xmb->num_categories = g_extern.core_info->count + 1; + menu->num_categories = 1; + if (g_extern.core_info) + menu->num_categories = g_extern.core_info->count + 1; return menu; @@ -1410,7 +1403,7 @@ static void xmb_context_reset(void *data) if (!info_list) return; - for (i = 1; i < xmb->num_categories; i++) + for (i = 1; i < driver.menu->num_categories; i++) { node = xmb_node_for_core(i-1); @@ -1634,7 +1627,7 @@ static void xmb_context_destroy(void *data) for (i = 0; i < XMB_TEXTURE_LAST; i++) glDeleteTextures(1, &xmb->textures[i].id); - for (i = 1; i < xmb->num_categories; i++) + for (i = 1; i < driver.menu->num_categories; i++) { xmb_node_t *node = xmb_node_for_core(i-1); @@ -1672,7 +1665,7 @@ static void xmb_toggle(bool menu_on) xmb->prevent_populate = !menu->need_refresh; - for (i = 0; i < xmb->num_categories; i++) + for (i = 0; i < driver.menu->num_categories; i++) { xmb_node_t *node = i ? xmb_node_for_core(i-1) : &xmb->settings_node; diff --git a/menu/menu_driver.h b/menu/menu_driver.h index dae4a479fd..ba59ab3d00 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -82,6 +82,7 @@ typedef struct menu_list_t *menu_list; size_t cat_selection_ptr; + size_t num_categories; size_t selection_ptr; bool need_refresh; bool msg_force; diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index d3e211d6b4..5ddcd89999 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -2023,7 +2023,7 @@ static int action_toggle_mainmenu(unsigned type, const char *label, push_list = 1; break; case MENU_ACTION_RIGHT: - if (driver.menu->cat_selection_ptr == g_extern.core_info->count) + if (driver.menu->cat_selection_ptr == driver.menu->num_categories-1) break; push_list = 1; break;