iOS/tvOS support

.gitignore

@@ -4,3 +4,4 @@ build_switch
 libromfs-generator
 build-ios
 build
+vcpkg_installed

CMakeLists.txt

@@ -36,7 +36,7 @@ set(VERSION_MAJOR "1")
 set(VERSION_MINOR "2")
 set(VERSION_ALTER "1")
 set(VERSION_BUILD "1")
-set(PACKAGE_NAME "com.xitrix.moonlight")
+set(PACKAGE_NAME "ru.xitrix.Moonlight")
 set(PSN_TITLE_ID  "MNTL00000")
 set(PSN_VERSION  "01.00")
 set(PROJECT_AUTHOR "XITRIX")
@@ -173,7 +173,12 @@ elseif (PLATFORM_IOS)
             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_ALTER}")
     list(APPEND IOS_FRAMEWORKS ${CMAKE_CURRENT_SOURCE_DIR}/extern/borealis/library/lib/extern/angle/ios/MetalANGLE.framework)
     set_target_properties(${PROJECT_NAME} PROPERTIES 
-        XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY ON)
+        INSTALL_RPATH @executable_path/Frameworks
+        XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY ON
+        XCODE_ATTRIBUTE_INFOPLIST_KEY_LSApplicationCategoryType "public.app-category.games"
+        XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
+        XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/extern/borealis/library/lib/extern/angle/ios/"
+        XCODE_ATTRIBUTE_INSTALL_PATH $(LOCAL_APPS_DIR))
 elseif (PLATFORM_TVOS)
     ios_bundle(
             "${CMAKE_CURRENT_SOURCE_DIR}/app/platforms/ios/tvos/Splash.storyboard"
@@ -183,7 +188,13 @@ elseif (PLATFORM_TVOS)
             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_ALTER}")
     list(APPEND IOS_FRAMEWORKS ${CMAKE_CURRENT_SOURCE_DIR}/extern/borealis/library/lib/extern/angle/tvos/MetalANGLE.framework)
     set_target_properties(${PROJECT_NAME} PROPERTIES 
-        XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY ON)
+        INSTALL_RPATH @executable_path/Frameworks
+        XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY ON
+        XCODE_ATTRIBUTE_INFOPLIST_KEY_LSApplicationCategoryType "public.app-category.games"
+        XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/Frameworks"
+        XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/extern/borealis/library/lib/extern/angle/tvos/"
+        XCODE_ATTRIBUTE_INSTALL_PATH $(LOCAL_APPS_DIR)
+        XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIconTvOS")
 endif ()
 
 target_include_directories(${PROJECT_NAME} PUBLIC

app/platforms/ios/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -5,6 +5,30 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "moonlight 1.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "moonlight 2.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
   "info" : {

app/platforms/ios/Images.xcassets/tvOS.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json → app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/App Icon.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -1,10 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Frame 5.png",
       "idiom" : "tv",
       "scale" : "1x"
     },
     {
+      "filename" : "Frame [email protected]",
       "idiom" : "tv",
       "scale" : "2x"
     }

app/platforms/ios/Images.xcassets/tvOS.brandassets/Top Shelf Image Wide.imageset/Contents.json → app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/App Icon.imagestack/Front.imagestacklayer/Content.imageset/Contents.json

@@ -1,10 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Frame 5.png",
       "idiom" : "tv",
       "scale" : "1x"
     },
     {
+      "filename" : "Frame [email protected]",
       "idiom" : "tv",
       "scale" : "2x"
     }

app/platforms/ios/Images.xcassets/tvOS.brandassets/Top Shelf Image.imageset/Contents.json → app/platforms/ios/Images.xcassets/AppIconTvOs.brandassets/App Icon.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json

@@ -1,10 +1,12 @@
 {
   "images" : [
     {
+      "filename" : "Frame 5.png",
       "idiom" : "tv",
       "scale" : "1x"
     },
     {
+      "filename" : "Frame [email protected]",
       "idiom" : "tv",
       "scale" : "2x"
     }

app/platforms/ios/iOSBundleInfo.plist.in

@@ -66,5 +66,16 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>GCSupportedGameControllers</key>
+	<array>
+		<dict>
+			<key>ProfileName</key>
+			<string>ExtendedGamepad</string>
+		</dict>
+	</array>
+	<key>GCSupportsControllerUserInteraction</key>
+	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.games</string>
 </dict>
 </plist>

app/src/main.cpp

@@ -111,6 +111,9 @@ int main(int argc, char* argv[]) {
     // Exit
 #ifdef __SWITCH__
     nvExit();
+#elif defined(PLATFORM_TVOS)
+    exit(0);
 #endif
+
     return EXIT_SUCCESS;
 }

extern/cmake/toolchain.cmake

@@ -34,6 +34,7 @@ elseif (PLATFORM_IOS OR PLATFORM_TVOS)
     set(DEPLOYMENT_TARGET 13.0)
     set(CMAKE_TOOLCHAIN_FILE ${EXTERN_PATH}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE PATH "vcpkg toolchain file")
     set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${BOREALIS_LIBRARY}/cmake/ios.toolchain.cmake CACHE PATH "ios toolchain file")
+    set(CMAKE_SHARED_LINKER_FLAGS "-rpath @executable_path/Frameworks -rpath @loader_path/Frameworks")
     set(USE_SDL2 ON)
     set(USE_GLFW OFF)
     set(USE_GLES3 ON)