From 5cb9bddea9addabc259a9531faa7dfc30752ba68 Mon Sep 17 00:00:00 2001 From: rock88 Date: Thu, 2 Oct 2014 21:05:43 +0700 Subject: [PATCH 1/4] iOS: update few compiler path --- ios/ios.toolchain.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/ios.toolchain.cmake b/ios/ios.toolchain.cmake index 90a13eb2b5..f161f2930e 100644 --- a/ios/ios.toolchain.cmake +++ b/ios/ios.toolchain.cmake @@ -49,6 +49,8 @@ endif (CMAKE_UNAME) include (CMakeForceCompiler) CMAKE_FORCE_C_COMPILER (gcc gcc) CMAKE_FORCE_CXX_COMPILER (g++ g++) +CMAKE_FORCE_C_COMPILER (/usr/bin/clang Apple) +CMAKE_FORCE_CXX_COMPILER (/usr/bin/clang++ Apple) # Skip the platform compiler checks for cross compiling set (CMAKE_CROSSCOMPILING TRUE) From 4dc6e268014d229fa7aa12cd3a5b163fbe15ff9f Mon Sep 17 00:00:00 2001 From: rock88 Date: Thu, 2 Oct 2014 21:49:06 +0700 Subject: [PATCH 2/4] iOS: add LaunchScreen.xib for support iPhone 6 and 6 Plus native screen resolution --- ios/assets/LaunchScreen.xib | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 ios/assets/LaunchScreen.xib diff --git a/ios/assets/LaunchScreen.xib b/ios/assets/LaunchScreen.xib new file mode 100644 index 0000000000..70ae06b281 --- /dev/null +++ b/ios/assets/LaunchScreen.xib @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + From 39716c68b3da13de88fe4b7c5ba068d70c84c9a8 Mon Sep 17 00:00:00 2001 From: rock88 Date: Thu, 2 Oct 2014 21:49:49 +0700 Subject: [PATCH 3/4] iOS: install LaunchScreen.xib --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45b0837097..7d74a39b7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1498,7 +1498,12 @@ 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") - add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${SHADER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource}) + 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}) else() add_executable(${TargetBin} ${NativeAppSource}) endif() From b7db78362db88852f99182b400e1a52603f2e259 Mon Sep 17 00:00:00 2001 From: rock88 Date: Fri, 3 Oct 2014 17:50:12 +0700 Subject: [PATCH 4/4] iOS: Add launch xib name to info.plist --- ios/PPSSPP-Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist index 0408e4b079..9f13bf9b8e 100644 --- a/ios/PPSSPP-Info.plist +++ b/ios/PPSSPP-Info.plist @@ -58,5 +58,7 @@ 1 2 + UILaunchStoryboardName + LaunchScreen