Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-22 21:09:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

iOS: Default to 2x internal resolution, slight build script improvements

Browse Source
This commit is contained in:
Henrik Rydgård 2024-05-10 10:12:14 +02:00
parent b8248c51cc
commit dd6a04a525
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2865,9 +2865,10 @@ if(IOS AND NOT LIBRETRO)
message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin}") message(STATUS "DevTeam: ${DEVELOPMENT_TEAM_ID} Icon: ${ICON_NAME} Target: ${TargetBin}")
message(STATUS "CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}") message(STATUS "CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR}")
# This is for injecting the version into the plist. # This is for injecting the version into the plist, and also copying resources.
# Should find a different way to do both these things.
add_custom_command(TARGET ${TargetBin} POST_BUILD add_custom_command(TARGET ${TargetBin} POST_BUILD
COMMAND echo "Creating ${APP_DIR_NAME}" COMMAND echo "Creating ${APP_DIR_NAME} for app store build"
COMMAND mkdir -p \"${APP_DIR_NAME}\" COMMAND mkdir -p \"${APP_DIR_NAME}\"
# This tar command seems to be responsible for copying assets. I thought we had another step that did that.. # This tar command seems to be responsible for copying assets. I thought we had another step that did that..
# Prepend -v to the extracting command to see the files copied. # Prepend -v to the extracting command to see the files copied.
@ -2907,6 +2908,7 @@ if(IOS AND NOT LIBRETRO)
else() else()
# This is for injecting the version into the plist. # This is for injecting the version into the plist.
add_custom_command(TARGET PPSSPP POST_BUILD add_custom_command(TARGET PPSSPP POST_BUILD
COMMAND echo "Creating ${APP_DIR_NAME} for sideload build"
COMMAND mkdir -p \"${APP_DIR_NAME}\" COMMAND mkdir -p \"${APP_DIR_NAME}\"
COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\" COMMAND tar -c -C ${CMAKE_CURRENT_BINARY_DIR} --exclude .DS_Store --exclude .git assets *.png | tar -x -C \"${APP_DIR_NAME}\"
COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\" COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/ios/macbundle.sh" \"${APP_DIR_NAME}\"

6
Core/Config.cpp
View File

@ -357,9 +357,11 @@ static const ConfigSetting cpuSettings[] = {
}; };
static int DefaultInternalResolution() { static int DefaultInternalResolution() {
// Auto on Windows and Linux, 2x on large screens, 1x elsewhere. // Auto on Windows and Linux, 2x on large screens and iOS, 1x elsewhere.
#if defined(USING_WIN_UI) || defined(USING_QT_UI) #if defined(USING_WIN_UI) || defined(USING_QT_UI)
return 0; return 0;
#elif PPSSPP_PLATFORM(IOS)
return 2;
#else #else
if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_VR) { if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_VR) {
return 4; return 4;
@ -380,7 +382,7 @@ static int DefaultFastForwardMode() {
} }
static int DefaultAndroidHwScale() { static int DefaultAndroidHwScale() {
#ifdef __ANDROID__ #if PPSSPP_PLATFORM(ANDROID)
if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 19 || System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) { if (System_GetPropertyInt(SYSPROP_SYSTEMVERSION) >= 19 || System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) {
// Arbitrary cutoff at Kitkat - modern devices are usually powerful enough that hw scaling // Arbitrary cutoff at Kitkat - modern devices are usually powerful enough that hw scaling
// doesn't really help very much and mostly causes problems. See #11151 // doesn't really help very much and mostly causes problems. See #11151

5
b-appstore.sh
View File

@ -23,6 +23,7 @@ else
echo "Non-GOLD build." echo "Non-GOLD build."
fi fi
echo "Clearing and re-creating output directory"
rm -rf $FOLDER_NAME rm -rf $FOLDER_NAME
mkdir $FOLDER_NAME mkdir $FOLDER_NAME
@ -39,5 +40,9 @@ popd
# Avoid XCode race condition (???) by pre-generating git-version.cpp # Avoid XCode race condition (???) by pre-generating git-version.cpp
cmake -DSOURCE_DIR=. -DOUTPUT_DIR=$FOLDER_NAME -P git-version.cmake cmake -DSOURCE_DIR=. -DOUTPUT_DIR=$FOLDER_NAME -P git-version.cmake
echo
echo "*** Done. Now run the following command to open in XCode, then run or archive:"
echo " open $FOLDER_NAME/PPSSPP.xcodeproj"
# To open the xcode project: # To open the xcode project:
# open build-ios/PPSSPP.xcodeproj # open build-ios/PPSSPP.xcodeproj