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