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.

Sign up for GitHub

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

Jump to bottom

macOS: Try creating an x64_64 + arm64 fat binary #3754

Merged
merged 5 commits into from
Jun 28, 2023
Merged

macOS: Try creating an x64_64 + arm64 fat binary #3754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c33c70
macOS: Try creating an x64_64 + arm64 fat binary
bjorn May 21, 2023
a5ce04d
Don't try to build the Qt 5.12 version for arm64
bjorn May 22, 2023
829742b
Try to build fat / universal zstd library for macOS
bjorn Jun 27, 2023
84fae26
Merge branch 'master' into macos-arm64
bjorn Jun 27, 2023
442d2ad
Updated NEWS.md
bjorn Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,11 @@ jobs:
- qt_version: 5.12.12
version_suffix: "10.12-10.13"
qt_creator_version: 5.0.3
architectures: x86_64
- qt_version: 6.5.1
version_suffix: "10.14+"
qt_creator_version: 7.0.2
architectures: x86_64,arm64

env:
TILED_VERSION: ${{ needs.version.outputs.version }}
Expand All @@ -219,12 +221,12 @@ jobs:
run: |
git clone --depth 1 -b master https://github.com/facebook/zstd.git
pushd zstd/lib
make libzstd.a
CFLAGS="-arch arm64 -arch x86_64" make libzstd.a
popd

- name: Build Tiled
run: |
qbs install --install-root install config:release qbs.installPrefix:"" projects.Tiled.staticZstd:true
qbs install --install-root install config:release qbs.architectures:${{ matrix.architectures }} qbs.installPrefix:"" projects.Tiled.staticZstd:true

- name: Deploy Qt
run: |
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* Godot 4 plugin: Export custom tile properties as Custom Data Layers (with Kevin Harrison, #3653)
* AppImage: Updated to Sentry 0.6.3
* Qt 6: Increased the image allocation limit from 1 GB to 4 GB (#3616)
* macOS: The macOS 10.14+ build is now a Universal macOS Binary (#3707)

### Tiled 1.10.1 (4 April 2023)

Expand Down