diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6b2854464..05cd57251f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -788,6 +788,10 @@ elseif(IOS)
if(EXISTS "${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks/GameController.framework")
set(nativeExtraLibs ${nativeExtraLibs} "-weak_framework GameController")
endif()
+
+ if(NOT ICONV_LIBRARY)
+ set(nativeExtraLibs ${nativeExtraLibs} iconv)
+ endif()
set_source_files_properties(ios/AppDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set_source_files_properties(ios/ViewController.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
@@ -1675,7 +1679,11 @@ if(IOS)
add_dependencies(PPSSPP ${CoreLibName} GPU Common native)
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(INSTALL ${IOSAssets} DESTINATION assets)
+ file(GLOB IOSAssets ios/assets/Default-568h@*.png)
+ file(INSTALL ${IOSAssets} DESTINATION .)
if (IOS_DEBUG)
file(INSTALL pspautotests DESTINATION assets)
endif()
@@ -1685,7 +1693,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 gnu assets | tar -x -C '${APP_DIR_NAME}'
+ COMMAND tar -c -C . --exclude .DS_Store --exclude .git -H gnu assets *.png | tar -x -C '${APP_DIR_NAME}'
)
# Force Xcode to relink the binary.
add_custom_command(TARGET Core PRE_BUILD
diff --git a/ios/PPSSPP-Info.plist b/ios/PPSSPP-Info.plist
index 0408e4b079..6ef7598045 100644
--- a/ios/PPSSPP-Info.plist
+++ b/ios/PPSSPP-Info.plist
@@ -50,7 +50,7 @@
assets/Icon@2x.png
UILaunchImageFile
- assets/Default.png
+ Default.png
UIFileSharingEnabled
UIDeviceFamily