From 6ea4924ee91fa1d00613908295fa3d4a50bd6112 Mon Sep 17 00:00:00 2001 From: Kentucky Compass Date: Thu, 4 Jan 2018 09:56:49 -0800 Subject: [PATCH] require iOS 8, add a launch screen --- CMakeLists.txt | 9 +++++++++ ios/Launch Screen.storyboard | 30 ++++++++++++++++++++++++++++++ ios/PPSSPP-Info.plist | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 ios/Launch Screen.storyboard diff --git a/CMakeLists.txt b/CMakeLists.txt index a73684bf8e..d8cdbee3a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1859,7 +1859,11 @@ if (TargetBin) set_source_files_properties(${SHADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets/shaders") endif() + if (IOS) + add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${SHADER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Launch Screen.storyboard") + else() add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${SHADER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource}) + endif() elseif(WIN32) add_executable(${TargetBin} WIN32 ${NativeAppSource}) set_target_properties(${TargetBin} PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS") @@ -1877,6 +1881,7 @@ file(INSTALL assets/flash0 DESTINATION assets) 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) @@ -1887,6 +1892,7 @@ if(IOS) 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 ) @@ -1899,8 +1905,11 @@ if(IOS) 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}\" ) + 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" + 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 diff --git a/ios/Launch Screen.storyboard b/ios/Launch Screen.storyboard new file mode 100644 index 0000000000..5b0377f076 --- /dev/null +++ b/ios/Launch Screen.storyboard @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist index 6ef7598045..5893f242c8 100644 --- a/ios/PPSSPP-Info.plist +++ b/ios/PPSSPP-Info.plist @@ -58,5 +58,7 @@ 1 2 + UILaunchStoryboardName + Launch Screen