iOS initial

Author: Try

CMakeLists.txt

@@ -40,11 +40,19 @@ if(WIN32)
   else()
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mwindows -lstdc++fs")
   endif()
+elseif(APPLE OR IOS)
+  enable_language(OBJCXX)
+  set(MACOSX_BUNDLE_GUI_IDENTIFIER "opengothic.gothic2")
+  set(MACOSX_BUNDLE_INFO_PLIST, "${MACOSX_BUNDLE_GUI_IDENTIFIER}")
+  set(MACOSX_BUNDLE_BUNDLE_VERSION 1)
+  set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.0")
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 15.0)
+  set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY XCODE_STARTUP_PROJECT ${PROJECT_NAME})
 endif()
 
-if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)
-  enable_language(OBJCXX)
+if(IOS)
+  file(GLOB_RECURSE ObjCSOURCES "game/*.mm")
+elseif(APPLE)
   target_link_libraries(${PROJECT_NAME} "-framework AppKit")
   file(GLOB_RECURSE ObjCSOURCES "game/*.mm")
 endif()

game/commandline.cpp

@@ -92,7 +92,7 @@ CommandLine::CommandLine(int argc, const char** argv) {
   if(gpath.empty()) {
     InstallDetect inst;
     gpath = inst.detectG2();
-#ifdef __OSX__
+#if defined(__OSX__) || defined(__IOS__)
     if(!gpath.empty() && gpath==inst.applicationSupportDirectory()) {
       std::filesystem::current_path(gpath);
       }

game/main.cpp

@@ -10,7 +10,7 @@
 #include <Tempest/DirectX12Api>
 #endif
 
-#if defined(__OSX__)
+#if defined(__OSX__) || defined(__IOS__)
 #include <Tempest/MetalApi>
 #endif
 
@@ -47,14 +47,14 @@ std::unique_ptr<Tempest::AbstractGraphicsApi> mkApi(const CommandLine& g) {
       break;
 #endif
     case CommandLine::Vulkan:
-#if !defined(__OSX__)
+#if !defined(__OSX__) && !defined(__IOS__)
       return std::make_unique<Tempest::VulkanApi>(flg);
 #else
       break;
 #endif
     }
 
-#if defined(__OSX__)
+#if defined(__OSX__) || defined(__IOS__)
   return std::make_unique<Tempest::MetalApi>(flg);
 #else
   return std::make_unique<Tempest::VulkanApi>(flg);

game/utils/installdetect.cpp

@@ -16,7 +16,7 @@ InstallDetect::InstallDetect() {
   pfiles    = programFiles(false);
   pfilesX86 = programFiles(true);
 #endif
-#ifdef __OSX__
+#if defined(__OSX__) || defined(__IOS__)
   appDir    = applicationSupportDirectory();
 #endif
   }
@@ -27,7 +27,7 @@ std::u16string InstallDetect::detectG2() {
   if(ret.empty())
     ret = detectG2(pfilesX86);
   return ret;
-#elif defined(__OSX__)
+#elif defined(__OSX__) || defined(__IOS__)
   if(FileUtil::exists(appDir))
     return appDir;
   return u"";

game/utils/installdetect.h

@@ -8,7 +8,7 @@ class InstallDetect final {
     InstallDetect();
 
     std::u16string detectG2();
-#ifdef __OSX__
+#if defined(__OSX__) || defined(__IOS__)
     static std::u16string applicationSupportDirectory();
 #endif
 
@@ -20,7 +20,7 @@ class InstallDetect final {
     std::u16string pfiles, pfilesX86;
 #endif
 
-#ifdef __OSX__
+#if defined(__OSX__) || defined(__IOS__)
     std::u16string appDir;
 #endif
   };

game/utils/installdetect.mm

@@ -7,14 +7,25 @@
 #include <Tempest/TextCodec>
 
 #import <Foundation/Foundation.h>
+
+#if defined(OSX)
 #import <Cocoa/Cocoa.h>
+#endif
 
 std::u16string InstallDetect::applicationSupportDirectory() {
   std::string ret;
 
+#if defined(__OSX__)
   NSArray* paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#else
+  NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+#endif
   if(paths!=nil && [paths count]>0) {
+#if defined(__OSX__)
     NSString* app = [[paths firstObject] stringByAppendingPathComponent:@"OpenGothic"];
+#else
+    NSString* app = [[paths firstObject] stringByAppendingPathComponent:@""];
+#endif
     if(app!=nil) {
       ret = [app cStringUsingEncoding:NSUTF8StringEncoding];
       [app release];