Port installer flow to iOS runtime

Author: aperezro

UnleashedRecomp/CMakeLists.txt

@@ -78,6 +78,8 @@ set(UNLEASHED_RECOMP_COMPILE_DEFINITIONS
 
 if (NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
     list(APPEND UNLEASHED_RECOMP_COMPILE_DEFINITIONS SDL_MAIN_HANDLED)
+else()
+    list(APPEND UNLEASHED_RECOMP_COMPILE_DEFINITIONS UNLEASHED_RECOMP_IOS)
 endif()
 
 add_compile_definitions(${UNLEASHED_RECOMP_COMPILE_DEFINITIONS})
@@ -116,10 +118,18 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
         "os/linux/user_linux.cpp"
         "os/linux/version_linux.cpp"
     )
+elseif (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+    set(UNLEASHED_RECOMP_OS_CXX_SOURCES
+        "os/ios/logger_ios.cpp"
+        "os/ios/media_ios.cpp"
+        "os/ios/process_ios.mm"
+        "os/ios/user_ios.mm"
+        "os/ios/version_ios.mm"
+    )
 elseif (APPLE)
     set(UNLEASHED_RECOMP_OS_CXX_SOURCES
         "os/macos/logger_macos.cpp"
-        "os/macos/media_macos.cpp"
+        "os/macos/media_macos.cpp"
         "os/macos/process_macos.cpp"
         "os/macos/user_macos.cpp"
         "os/macos/version_macos.cpp"
@@ -453,6 +463,12 @@ if (CMAKE_SYSTEM_NAME STREQUAL "iOS" AND TARGET SDL2::SDL2main)
     list(PREPEND UNLEASHED_RECOMP_SDL_LIBS SDL2::SDL2main)
 endif()
 
+set(UNLEASHED_RECOMP_PLATFORM_LIBS)
+if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
+    list(APPEND UNLEASHED_RECOMP_PLATFORM_LIBS MoltenVK)
+    target_link_options(UnleashedRecomp PRIVATE "LINKER:-u,_vkGetInstanceProcAddr")
+endif()
+
 target_link_libraries(UnleashedRecomp PRIVATE
     fmt::fmt
     libzstd_static
@@ -463,11 +479,12 @@ target_link_libraries(UnleashedRecomp PRIVATE
     ${UNLEASHED_RECOMP_SDL_LIBS}
     SDL2_mixer
     tomlplusplus::tomlplusplus
-    UnleashedRecompLib
-    xxHash::xxhash
-    CURL::libcurl
-    plume
-)
+    UnleashedRecompLib
+    xxHash::xxhash
+    CURL::libcurl
+    plume
+    ${UNLEASHED_RECOMP_PLATFORM_LIBS}
+)
 
 target_include_directories(UnleashedRecomp PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}

UnleashedRecomp/os/ios/logger_ios.cpp

@@ -0,0 +1,19 @@
+#include <os/logger.h>
+
+void os::logger::Init()
+{
+}
+
+void os::logger::Log(const std::string_view str, ELogType type, const char* func)
+{
+    (void)type;
+
+    if (func)
+    {
+        fmt::println("[{}] {}", func, str);
+    }
+    else
+    {
+        fmt::println("{}", str);
+    }
+}

UnleashedRecomp/os/ios/media_ios.cpp

@@ -0,0 +1,6 @@
+#include <os/media.h>
+
+bool os::media::IsExternalMediaPlaying()
+{
+    return false;
+}

UnleashedRecomp/os/ios/process_ios.mm

@@ -0,0 +1,62 @@
+#include <os/process.h>
+
+#import <Foundation/Foundation.h>
+
+#include <mach-o/dyld.h>
+#include <sys/param.h>
+#include <unistd.h>
+
+std::filesystem::path os::process::GetExecutablePath()
+{
+    uint32_t exePathSize = PATH_MAX;
+    char exePath[PATH_MAX] = {};
+    if (_NSGetExecutablePath(exePath, &exePathSize) == 0)
+    {
+        return std::filesystem::path(std::u8string_view(reinterpret_cast<const char8_t*>(exePath)));
+    }
+
+    return {};
+}
+
+std::filesystem::path os::process::GetExecutableRoot()
+{
+    @autoreleasepool
+    {
+        NSString* resourcePath = [[NSBundle mainBundle] resourcePath];
+        if (resourcePath.length > 0)
+            return std::filesystem::path(std::u8string_view(reinterpret_cast<const char8_t*>(resourcePath.UTF8String)));
+    }
+
+    return GetExecutablePath().remove_filename();
+}
+
+std::filesystem::path os::process::GetWorkingDirectory()
+{
+    char cwd[PATH_MAX] = {};
+    if (getcwd(cwd, sizeof(cwd)) != nullptr)
+        return std::filesystem::path(std::u8string_view(reinterpret_cast<const char8_t*>(cwd)));
+
+    return {};
+}
+
+bool os::process::SetWorkingDirectory(const std::filesystem::path& path)
+{
+    return chdir(path.c_str()) == 0;
+}
+
+bool os::process::StartProcess(const std::filesystem::path& path, const std::vector<std::string>& args, std::filesystem::path work)
+{
+    (void)path;
+    (void)args;
+    (void)work;
+    return false;
+}
+
+void os::process::CheckConsole()
+{
+    g_consoleVisible = false;
+}
+
+void os::process::ShowConsole()
+{
+}

UnleashedRecomp/os/ios/user_ios.mm

@@ -0,0 +1,11 @@
+#include <os/user.h>
+
+#import <UIKit/UIKit.h>
+
+bool os::user::IsDarkTheme()
+{
+    if (@available(iOS 13.0, *))
+        return UIScreen.mainScreen.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
+
+    return false;
+}

UnleashedRecomp/os/ios/version_ios.mm

@@ -0,0 +1,15 @@
+#include <os/version.h>
+
+#import <UIKit/UIKit.h>
+
+os::version::OSVersion os::version::GetOSVersion()
+{
+    os::version::OSVersion result;
+
+    NSOperatingSystemVersion version = NSProcessInfo.processInfo.operatingSystemVersion;
+    result.Major = static_cast<uint32_t>(version.majorVersion);
+    result.Minor = static_cast<uint32_t>(version.minorVersion);
+    result.Build = static_cast<uint32_t>(version.patchVersion);
+
+    return result;
+}

UnleashedRecomp/res/ios/Info.plist.in

@@ -57,8 +57,12 @@
     <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
+    <key>LSSupportsOpeningDocumentsInPlace</key>
+    <true/>
     <key>MinimumOSVersion</key>
     <string>13.0</string>
+    <key>UIFileSharingEnabled</key>
+    <true/>
     <key>UIApplicationSupportsIndirectInputEvents</key>
     <true/>
     <key>UILaunchScreen</key>

UnleashedRecomp/ui/installer_wizard.cpp

@@ -1109,7 +1109,7 @@ static bool ConvertPathSet(const nfdpathset_t *pathSet, std::list<std::filesyste
 
 static void PickerThreadProcess()
 {
-    const nfdpathset_t *pathSet;
+    const nfdpathset_t *pathSet = nullptr;
     nfdresult_t result = NFD_ERROR;
     if (g_currentPickerFolderMode)
     {
@@ -1146,7 +1146,7 @@ static void PickerStart(bool folderMode) {
     g_currentPickerVisible = true;
 
     // Optional single thread mode for testing on systems that do not interact well with the separate thread being used for NFD.
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(UNLEASHED_RECOMP_IOS)
     constexpr bool singleThreadMode = true;
 #else
     constexpr bool singleThreadMode = false;

UnleashedRecomp/user/paths.cpp

@@ -22,6 +22,12 @@ std::filesystem::path BuildUserPath()
         userPath = std::filesystem::path{ knownPath } / USER_DIRECTORY;
 
     CoTaskMemFree(knownPath);
+#elif defined(UNLEASHED_RECOMP_IOS)
+    const char* homeDir = getenv("HOME");
+    if (homeDir != nullptr)
+    {
+        userPath = std::filesystem::path(homeDir) / "Documents" / USER_DIRECTORY;
+    }
 #elif defined(__linux__) || defined(__APPLE__)
     const char* homeDir = getenv("HOME");
 #if defined(__linux__)

thirdparty/CMakeLists.txt

@@ -25,9 +25,13 @@ endif()
 
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen")
 if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    add_library(nfd STATIC "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nfd_ios_stub.c")
+    find_library(UIKIT_LIBRARY UIKit REQUIRED)
+    find_library(FOUNDATION_LIBRARY Foundation REQUIRED)
+
+    add_library(nfd STATIC "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nfd_ios.mm")
     add_library(nfd::nfd ALIAS nfd)
     target_include_directories(nfd PUBLIC "${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended/src/include")
+    target_link_libraries(nfd PUBLIC ${UIKIT_LIBRARY} ${FOUNDATION_LIBRARY})
 else()
     add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended")
 endif()
@@ -36,6 +40,6 @@ add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/SDL")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/SDL_mixer")
 add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/plume")
 
-if (APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if (APPLE)
     add_subdirectory("${UNLEASHED_RECOMP_THIRDPARTY_ROOT}/MoltenVK")
 endif()