Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh iOS/macOS versions #18791

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Conversation

Florin9doi
Copy link
Contributor

@Florin9doi Florin9doi commented Jan 29, 2024

  • Fix CFBundleExecutable for QT version
  • Fix CFBundleVersion by searching git-version in BINARY_DIR
  • Fix TARGETED_DEVICE_FAMILY value
  • Remove i386 version for iOS simulator
  • Remove minus sign from CFBundleShortVersionString. Now the version is shown in iOS>Settings>General>Storage>PPSSPP

I also had to force ZSTD_ENABLE_ASM_X86_64_BMI2=0 to build the iOS version for simulator

@hrydgard
Copy link
Owner

Hm, does bumping the iOS target restrict deployment to older versions of iOS?

@Florin9doi
Copy link
Contributor Author

Yes, iOS 11 is no longer supported by the latest SDK. Should I revert it to iOS 11 to be used with older SDKs?

@Florin9doi
Copy link
Contributor Author

Won't work for

- name: Create macOS git-version.cpp for tagged release

@Florin9doi Florin9doi marked this pull request as draft January 30, 2024 07:02
@anr2me
Copy link
Collaborator

anr2me commented Jan 30, 2024

For the git-version.cpp generation, you can try using the method i use:

- name: Set Env Var(s)
run: |
echo "GIT_VERSION=$(git describe --always)" >> $GITHUB_ENV
- name: Create macOS git-version.cpp & Version.txt
run: |
echo "const char *PPSSPP_GIT_VERSION = \"${GIT_VERSION}\";" > git-version.cpp
echo "#define PPSSPP_GIT_VERSION_NO_UPDATE 1" >> git-version.cpp
# Create Version.txt file (should probably do this during building process)
mkdir build-ios
mkdir build-ios/PPSSPP.app
echo $(echo $GIT_VERSION | cut -c 2-) > build-ios/PPSSPP.app/Version.txt

@Florin9doi
Copy link
Contributor Author

It is already generated, but its location is different from build to build, sometimes it is placed in root directory and sometime it is placed in ./build[-version]

- Fix CFBundleExecutable for QT version
- Fix CFBundleVersion by searching git-version in BINARY_DIR
- Fix TARGETED_DEVICE_FAMILY value
- Remove i386 version for iOS simulator
- Remove minus sign from CFBundleShortVersionString
@hrydgard
Copy link
Owner

I'm happy to merge, but not sure if I should wait until after the 17.x series is done. (Likely won't go higher than 17.2 this time, maybe 17.1 will be enough)...

@hrydgard hrydgard modified the milestones: 1.17.1, v1.18.0 Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants