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 f3d572a2fc..82e3d2c4d0 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 @@ -10,23 +10,23 @@ RetroArch_iOS IDESourceControlProjectOriginsDictionary - 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A - git://github.com/libretro/common-overlays.git 76200F0D6584D865E96F58DE862E738E88B23A3C https://github.com/libretro/libretro-super.git C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 https://github.com/libretro/RetroArch.git + EF363D58F01B3FB341FA6C851870E60E4F080E97 + git://github.com/libretro/common-overlays.git IDESourceControlProjectPath apple/RetroArch_iOS.xcodeproj/project.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A - ../../../media/overlays 76200F0D6584D865E96F58DE862E738E88B23A3C ../../../.. C7C12374C7051F8843B3EFA1ACCAF2907102CCF7 ../../.. + EF363D58F01B3FB341FA6C851870E60E4F080E97 + ../../../media/overlays IDESourceControlProjectURL https://github.com/libretro/RetroArch.git @@ -40,7 +40,15 @@ IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 49FCA0A2-0FE0-4A7A-9C54-642C68ED726A + 76200F0D6584D865E96F58DE862E738E88B23A3C + IDESourceControlWCCName + + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + EF363D58F01B3FB341FA6C851870E60E4F080E97 IDESourceControlWCCName overlays diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 4ff32fed36..5cd49006a8 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -608,8 +608,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U { if (path) { - /* TODO - reimplement this - should no longer use apple_run_core. */ - apple_run_core(0, NULL, core.UTF8String, path.UTF8String); + strlcpy(g_settings.libretro, core.UTF8String, sizeof(g_settings.libretro)); + strlcpy(g_extern.fullpath, path.UTF8String, sizeof(g_extern.fullpath)); + rarch_main_command(RARCH_CMD_LOAD_CORE); + rarch_main_command(RARCH_CMD_LOAD_CONTENT); } else { @@ -636,8 +638,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U { if (weakSelf.core) { - /* TODO - reimplement this - should no longer use apple_run_core. */ - apple_run_core(0, NULL, weakSelf.core.UTF8String, item.path.UTF8String); + strlcpy(g_settings.libretro, weakSelf.core.UTF8String, sizeof(g_settings.libretro)); + strlcpy(g_extern.fullpath, item.path.UTF8String, sizeof(g_extern.fullpath)); + rarch_main_command(RARCH_CMD_LOAD_CORE); + rarch_main_command(RARCH_CMD_LOAD_CONTENT); } else [weakSelf chooseCoreWithPath:item.path]; @@ -713,10 +717,14 @@ static void RunActionSheet(const char* title, const struct string_list* items, U const char *core_name = NULL; content_playlist_get_index(weakSelf.history, i, &path, &core_path, &core_name); - - /* TODO - reimplement this - should no longer use apple_run_core. */ - apple_run_core(0, NULL, core_path ? core_path : "", - path ? path : ""); + + if (!path || !core_path) + return; + + strlcpy(g_settings.libretro, core_path, sizeof(g_settings.libretro)); + strlcpy(g_extern.fullpath, path, sizeof(g_extern.fullpath)); + rarch_main_command(RARCH_CMD_LOAD_CORE); + rarch_main_command(RARCH_CMD_LOAD_CONTENT); } detail: ^{