diff --git a/CMakeLists.txt b/CMakeLists.txt index f0be1a6f80..6dd04b3092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2795,10 +2795,7 @@ if(TargetBin) if(IOS) set(AssetCatalog "") - if(IOS_APP_STORE) - message("Adding asset catalog to build") - set(AssetCatalog "${CMAKE_SOURCE_DIR}/ios/assets.xcassets") - endif() + set(AssetCatalog "${CMAKE_SOURCE_DIR}/ios/assets.xcassets") add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${AssetCatalog} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard") if(NOT IOS_APP_STORE) file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/") @@ -2862,18 +2859,26 @@ if(IOS AND NOT LIBRETRO) #endif() set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}) - if(IOS_APP_STORE) - if(GOLD) - set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStoreGold.plist") + set(PRODUCT_NAME "PPSSPP") + set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist") + if(GOLD) + if(IOS_APP_STORE) set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-gold") - set(ICON_NAME "AppIconGold") - set(PRODUCT_NAME "PPSSPP") else() - set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist") - set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free") - set(ICON_NAME "AppIcon") - set(PRODUCT_NAME "PPSSPP") + set(BUNDLE_IDENTIFIER "org.ppsspp.ppssppgold") endif() + set(ICON_NAME "AppIconGold") + set(DISPLAY_NAME "PPSSPP Gold") + else() + if(IOS_APP_STORE) + set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free") + else() + set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp") + endif() + set(ICON_NAME "AppIcon") + set(DISPLAY_NAME "PPSSPP") + endif() + if(IOS_APP_STORE) message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin}") message(STATUS "CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}") @@ -2931,11 +2936,12 @@ if(IOS AND NOT LIBRETRO) COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" ) set_target_properties(${TargetBin} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist" + MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST} XCODE_GENERATE_SCHEME YES RESOURCE "ios/Launch Screen.storyboard" RESOURCE "ios/Settings.bundle" RESOURCE "ext/vulkan/iOS/Frameworks" + XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME ${ICON_NAME} XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2" XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES @@ -2943,6 +2949,10 @@ if(IOS AND NOT LIBRETRO) XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-" ) endif() + add_custom_command(TARGET PPSSPP POST_BUILD + COMMAND plutil -replace CFBundleDisplayName -string \"${DISPLAY_NAME}\" "\"${APP_DIR_NAME}\"/Info.plist" + COMMAND plutil -replace CFBundleIdentifier -string \"${BUNDLE_IDENTIFIER}\" "\"${APP_DIR_NAME}\"/Info.plist" + ) endif() if(MACOSX AND NOT IOS) diff --git a/ios/PPSSPP-AppStore.plist b/ios/PPSSPP-AppStore.plist deleted file mode 100644 index 0c089fc93a..0000000000 --- a/ios/PPSSPP-AppStore.plist +++ /dev/null @@ -1,204 +0,0 @@ - - - - - UISupportsDocumentBrowser - - NSLocationWhenInUseUsageDescription - Your location may be used to emulate Go!Explore, a GPS accessory - NSCameraUsageDescription - Your camera may be used to emulate Go!Cam, a camera accessory - NSMicrophoneUsageDescription - Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory - CFBundleDisplayName - PPSSPP - CFBundleExecutable - PPSSPP - CFBundleIdentifier - org.ppsspp.ppsspp-free - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - PPSSPP - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - assets - - - - LSRequiresIPhoneOS - - UIViewControllerBasedStatusBarAppearance - - UIRequiresFullScreen - - UIRequiredDeviceCapabilities - - arm64 - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UILaunchImageFile - Default.png - UIFileSharingEnabled - - UILaunchStoryboardName - Launch Screen - CFBundleDocumentTypes - - - CFBundleTypeIconFiles - - CFBundleTypeName - ISO File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.iso - - - - CFBundleTypeIconFiles - - CFBundleTypeName - CSO File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.cso - - - - CFBundleTypeIconFiles - - CFBundleTypeName - ELF File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.elf - - - - CFBundleTypeIconFiles - - CFBundleTypeName - PBP File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.pbp - - - - UTExportedTypeDeclarations - - - UTTypeConformsTo - - public.data - public.iso-image - - UTTypeDescription - ISO File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.iso - UTTypeTagSpecification - - public.filename-extension - - iso - - - - - UTTypeConformsTo - - public.data - dyn.ah62d4rv4ge80g65t - - UTTypeDescription - CSO File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.cso - UTTypeTagSpecification - - public.filename-extension - - cso - - - - - UTTypeConformsTo - - public.data - dyn.ah62d4rv4ge80n5dg - - UTTypeDescription - ELF File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.elf - UTTypeTagSpecification - - public.filename-extension - - elf - - - - - UTTypeConformsTo - - public.data - dyn.ah62d4rv4ge81a2xu - - UTTypeDescription - PBP File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.pbp - UTTypeTagSpecification - - public.filename-extension - - pbp - - - - - - diff --git a/ios/PPSSPP-AppStoreGold.plist b/ios/PPSSPP-AppStoreGold.plist deleted file mode 100644 index b958f5eba6..0000000000 --- a/ios/PPSSPP-AppStoreGold.plist +++ /dev/null @@ -1,204 +0,0 @@ - - - - - UISupportsDocumentBrowser - - NSLocationWhenInUseUsageDescription - Your location may be used to emulate Go!Explore, a GPS accessory - NSCameraUsageDescription - Your camera may be used to emulate Go!Cam, a camera accessory - NSMicrophoneUsageDescription - Your microphone may be used to emulate Go!Cam/Talkman, a microphone accessory - CFBundleDisplayName - PPSSPP Gold - CFBundleExecutable - PPSSPP - CFBundleIdentifier - org.ppsspp.ppsspp-gold - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - PPSSPP - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - assets - - - - LSRequiresIPhoneOS - - UIViewControllerBasedStatusBarAppearance - - UIRequiresFullScreen - - UIRequiredDeviceCapabilities - - arm64 - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UILaunchImageFile - Default.png - UIFileSharingEnabled - - UILaunchStoryboardName - Launch Screen - CFBundleDocumentTypes - - - CFBundleTypeIconFiles - - CFBundleTypeName - ISO File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.iso - - - - CFBundleTypeIconFiles - - CFBundleTypeName - CSO File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.cso - - - - CFBundleTypeIconFiles - - CFBundleTypeName - ELF File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.elf - - - - CFBundleTypeIconFiles - - CFBundleTypeName - PBP File - LSHandlerRank - Owner - LSItemContentTypes - - ppsspp.pbp - - - - UTExportedTypeDeclarations - - - UTTypeConformsTo - - public.data - public.iso-image - - UTTypeDescription - ISO File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.iso - UTTypeTagSpecification - - public.filename-extension - - iso - - - - - UTTypeConformsTo - - public.data - dyn.ah62d4rv4ge80g65t - - UTTypeDescription - CSO File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.cso - UTTypeTagSpecification - - public.filename-extension - - cso - - - - - UTTypeConformsTo - - public.data - dyn.ah62d4rv4ge80n5dg - - UTTypeDescription - ELF File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.elf - UTTypeTagSpecification - - public.filename-extension - - elf - - - - - UTTypeConformsTo - - public.data - dyn.ah62d4rv4ge81a2xu - - UTTypeDescription - PBP File - UTTypeIconFiles - - UTTypeIdentifier - ppsspp.pbp - UTTypeTagSpecification - - public.filename-extension - - pbp - - - - - - diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist index 6e72de13ff..0ed64c4bc8 100644 --- a/ios/PPSSPP-Info.plist +++ b/ios/PPSSPP-Info.plist @@ -28,10 +28,22 @@ ???? CFBundleVersion 1.0 + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + assets + + + LSRequiresIPhoneOS UIViewControllerBasedStatusBarAppearance + UIRequiresFullScreen + UIRequiredDeviceCapabilities arm64 @@ -48,22 +60,10 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - CFBundleIconFiles - - assets/Icon-72.png - assets/Icon-72@2x.png - assets/Icon.png - assets/Icon@2x.png - UILaunchImageFile Default.png UIFileSharingEnabled - UIDeviceFamily - - 1 - 2 - UILaunchStoryboardName Launch Screen CFBundleDocumentTypes diff --git a/ios/assets/Icon-72.png b/ios/assets/Icon-72.png deleted file mode 100644 index 7d7eca138c..0000000000 Binary files a/ios/assets/Icon-72.png and /dev/null differ diff --git a/ios/assets/Icon-72@2x.png b/ios/assets/Icon-72@2x.png deleted file mode 100644 index c9d9095aec..0000000000 Binary files a/ios/assets/Icon-72@2x.png and /dev/null differ diff --git a/ios/assets/Icon-72@3x.png b/ios/assets/Icon-72@3x.png deleted file mode 100644 index efdde28b01..0000000000 Binary files a/ios/assets/Icon-72@3x.png and /dev/null differ diff --git a/ios/assets/Icon.png b/ios/assets/Icon.png deleted file mode 100644 index 44625336c5..0000000000 Binary files a/ios/assets/Icon.png and /dev/null differ diff --git a/ios/assets/Icon@2x.png b/ios/assets/Icon@2x.png deleted file mode 100644 index 9bcb28cc3d..0000000000 Binary files a/ios/assets/Icon@2x.png and /dev/null differ diff --git a/ios/assets/Icon@3x.png b/ios/assets/Icon@3x.png deleted file mode 100644 index 227eccb081..0000000000 Binary files a/ios/assets/Icon@3x.png and /dev/null differ diff --git a/ios/assets/IconGold-72.png b/ios/assets/IconGold-72.png deleted file mode 100644 index 5e4f7445e2..0000000000 Binary files a/ios/assets/IconGold-72.png and /dev/null differ diff --git a/ios/assets/IconGold-72@2x.png b/ios/assets/IconGold-72@2x.png deleted file mode 100644 index 5b2fc31ff7..0000000000 Binary files a/ios/assets/IconGold-72@2x.png and /dev/null differ diff --git a/ios/assets/IconGold-72@3x.png b/ios/assets/IconGold-72@3x.png deleted file mode 100644 index 25fa7224ce..0000000000 Binary files a/ios/assets/IconGold-72@3x.png and /dev/null differ diff --git a/ios/assets/IconGold.png b/ios/assets/IconGold.png deleted file mode 100644 index 7dbce17ae0..0000000000 Binary files a/ios/assets/IconGold.png and /dev/null differ diff --git a/ios/assets/IconGold@2x.png b/ios/assets/IconGold@2x.png deleted file mode 100644 index 5c75a1d68c..0000000000 Binary files a/ios/assets/IconGold@2x.png and /dev/null differ diff --git a/ios/assets/IconGold@3x.png b/ios/assets/IconGold@3x.png deleted file mode 100644 index 04ad386605..0000000000 Binary files a/ios/assets/IconGold@3x.png and /dev/null differ