diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22b4b802c3..3a8a38cfe6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2277,10 +2277,11 @@ set(NativeAssets
assets/sfx_select.wav
assets/sfx_toggle_off.wav
assets/sfx_toggle_on.wav
- source_assets/image/logo.png
- source_assets/image/icon_regular_72.png
)
+if(TARGET SDL2::SDL2 OR USING_QT_UI)
+ list(APPEND NativeAssets source_assets/image/icon_regular_72.png)
+endif()
if(HEADLESS)
set(HeadlessSource
@@ -2382,11 +2383,11 @@ if(TargetBin)
endif()
if(IOS)
- add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard")
- file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/")
+ add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
+ file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks")
else()
add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
- file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPPSDL.app/Contents/Frameworks/")
+ file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPPSDL.app/Contents/Frameworks")
if(TARGET SDL2::SDL2 AND NOT USING_QT_UI)
add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/SDL/macbundle.sh" "${CMAKE_BINARY_DIR}/PPSSPPSDL.app")
elseif(USING_QT_UI)
@@ -2416,19 +2417,16 @@ endif()
# packaging and code signing
if(IOS)
set(DEPLOYMENT_TARGET 8.0)
- file(GLOB IOSAssets ios/assets/*.png)
- list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@2x.png)
- list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@3x.png)
+ file(GLOB IOSAssets ios/assets/Icon*.png)
file(INSTALL ${IOSAssets} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/assets)
- file(GLOB IOSAssets ios/assets/Default-568h@*.png)
+ file(GLOB IOSAssets ios/assets/Default-568h@*.png source_assets/image/icon_regular_72.png source_assets/image/logo.png)
file(INSTALL ${IOSAssets} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(INSTALL ios/Settings.bundle DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
if(IOS_DEBUG)
file(INSTALL pspautotests DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/assets)
endif()
- set(RSRC_XIB_FILES assets/Icon@2x.png)
- set(RSRC_XIB_FILES "Launch Screen.storyboard")
- set_source_files_properties(${RSRC_XIB_FILES}
- PROPERTIES MACOSX_PACKAGE_LOCATION Resources
+ set_target_properties(${TargetBin} PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist"
)
#This breaks in modern XCode. Not sure when it worked...
#if(CMAKE_GENERATOR STREQUAL "Xcode")
@@ -2438,21 +2436,10 @@ if(IOS)
#endif()
add_custom_command(TARGET PPSSPP POST_BUILD
COMMAND mkdir -p \"${APP_DIR_NAME}\"
- COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\"
+ COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png Settings.bundle | tar -x -C \"${APP_DIR_NAME}\"
+ COMMAND ibtool --compile "${CMAKE_CURRENT_BINARY_DIR}/PPSSPP.app/Launch Screen.storyboardc" "${CMAKE_SOURCE_DIR}/ios/Launch Screen.storyboard"
COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\"
)
- set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET})
- set_target_properties(${TargetBin} PROPERTIES
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-Info.plist"
- RESOURCE "ios/Launch Screen.storyboard"
- RESOURCE "ios/Settings.bundle"
- RESOURCE "ext/vulkan/iOS/Frameworks"
- XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}
- XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad"
- XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
- XCODE_ATTRIBUTE_ENABLE_BITCODE NO
- XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
- )
endif()
if(UNIX AND NOT ANDROID AND NOT APPLE)
diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist
index 55d219357c..ceea4731cc 100644
--- a/ios/PPSSPP-Info.plist
+++ b/ios/PPSSPP-Info.plist
@@ -37,6 +37,7 @@
UIRequiredDeviceCapabilities
armv7
+ arm64
UIStatusBarHidden