Skip to content

Commit

Permalink
macOS: Build an x64_64 + arm64 fat binary (#3754)
Browse files Browse the repository at this point in the history
The Qt 6 build for macOS 10.14+ is now a universal app.

Closes #3707
  • Loading branch information
bjorn committed Jun 28, 2023
1 parent f23e815 commit c5c6971
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/packages.yml
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
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

0 comments on commit c5c6971

Please sign in to comment.