From 3f3e464dae7d0ab669b29e32c2fb1c221ae42999 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 8 Oct 2014 15:59:18 -0400 Subject: [PATCH 1/4] Revert "iOS: Add launch xib name to info.plist" This reverts commit b7db78362db88852f99182b400e1a52603f2e259. --- ios/PPSSPP-Info.plist | 2 -- 1 file changed, 2 deletions(-) diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist index 9f13bf9b8e..0408e4b079 100644 --- a/ios/PPSSPP-Info.plist +++ b/ios/PPSSPP-Info.plist @@ -58,7 +58,5 @@ 1 2 - UILaunchStoryboardName - LaunchScreen From f4216483cbdb6aca9eaf231e90d36314e0aaf972 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 8 Oct 2014 16:00:01 -0400 Subject: [PATCH 2/4] Revert "iOS: install LaunchScreen.xib" This reverts commit 39716c68b3da13de88fe4b7c5ba068d70c84c9a8. --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e4add2db5..ed095a5f39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1500,12 +1500,7 @@ if (TargetBin) set_source_files_properties(${LANG_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets/lang") set_source_files_properties(${SHADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS/assets/shaders") - if (IOS) - set(LAUNCH_SCREEN_XIB ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/LaunchScreen.xib) - set_source_files_properties(${LAUNCH_SCREEN_XIB} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") - endif() - - add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${SHADER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} ${LAUNCH_SCREEN_XIB}) + add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${SHADER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource}) else() add_executable(${TargetBin} ${NativeAppSource}) endif() From ea67baa45bbd454f0d2e104566471238d343a3ce Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 8 Oct 2014 16:00:16 -0400 Subject: [PATCH 3/4] Revert "iOS: add LaunchScreen.xib for support iPhone 6 and 6 Plus native screen resolution" This reverts commit 4dc6e268014d229fa7aa12cd3a5b163fbe15ff9f. --- ios/assets/LaunchScreen.xib | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 ios/assets/LaunchScreen.xib diff --git a/ios/assets/LaunchScreen.xib b/ios/assets/LaunchScreen.xib deleted file mode 100644 index 70ae06b281..0000000000 --- a/ios/assets/LaunchScreen.xib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - From 31b07d557137aea204efe83dd0359d058eca8c76 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 8 Oct 2014 16:00:36 -0400 Subject: [PATCH 4/4] iOS: MacOS compatible post-build command --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed095a5f39..ec1fe4f293 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1530,7 +1530,7 @@ if(IOS) ) set(APP_DIR_NAME \${TARGET_BUILD_DIR}/\${FULL_PRODUCT_NAME}) add_custom_command(TARGET PPSSPP POST_BUILD - COMMAND tar -c -C . --exclude .DS_Store --exclude .git -H assets | tar -x -C '${APP_DIR_NAME}' + COMMAND tar -c -C . --exclude .DS_Store --exclude .git -H gnu assets | tar -x -C '${APP_DIR_NAME}' ) # Force Xcode to relink the binary. add_custom_command(TARGET Core PRE_BUILD