mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-18 11:54:30 +01:00
commit
03c5c046e5
2 files changed
+10
-2
No files matched your search
+9
-1
@@ -788,6 +788,10 @@ elseif(IOS)
|
|||||||
if(EXISTS "${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks/GameController.framework")
|
if(EXISTS "${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks/GameController.framework")
|
||||||
set(nativeExtraLibs ${nativeExtraLibs} "-weak_framework GameController")
|
set(nativeExtraLibs ${nativeExtraLibs} "-weak_framework GameController")
|
||||||
endif()
|
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/AppDelegate.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
|
||||||
set_source_files_properties(ios/ViewController.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)
|
add_dependencies(PPSSPP ${CoreLibName} GPU Common native)
|
||||||
|
|
||||||
file(GLOB IOSAssets ios/assets/*.png)
|
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(INSTALL ${IOSAssets} DESTINATION assets)
|
||||||
|
file(GLOB IOSAssets ios/assets/Default-568h@*.png)
|
||||||
|
file(INSTALL ${IOSAssets} DESTINATION .)
|
||||||
if (IOS_DEBUG)
|
if (IOS_DEBUG)
|
||||||
file(INSTALL pspautotests DESTINATION assets)
|
file(INSTALL pspautotests DESTINATION assets)
|
||||||
endif()
|
endif()
|
||||||
@@ -1685,7 +1693,7 @@ if(IOS)
|
|||||||
)
|
)
|
||||||
set(APP_DIR_NAME \${TARGET_BUILD_DIR}/\${FULL_PRODUCT_NAME})
|
set(APP_DIR_NAME \${TARGET_BUILD_DIR}/\${FULL_PRODUCT_NAME})
|
||||||
add_custom_command(TARGET PPSSPP POST_BUILD
|
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.
|
# Force Xcode to relink the binary.
|
||||||
add_custom_command(TARGET Core PRE_BUILD
|
add_custom_command(TARGET Core PRE_BUILD
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
<string>assets/Icon@2x.png</string>
|
<string>assets/Icon@2x.png</string>
|
||||||
</array>
|
</array>
|
||||||
<key>UILaunchImageFile</key>
|
<key>UILaunchImageFile</key>
|
||||||
<string>assets/Default.png</string>
|
<string>Default.png</string>
|
||||||
<key>UIFileSharingEnabled</key>
|
<key>UIFileSharingEnabled</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>UIDeviceFamily</key>
|
<key>UIDeviceFamily</key>
|
||||||
|
|||||||
Reference in new issue
Block a user