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() 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 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 @@ + + + + + + + + + + + + + + + + + + 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)