From 2c33c701108dbca557e1dd26cfb9b579e77384dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Sun, 21 May 2023 21:10:18 +0200 Subject: [PATCH 1/4] macOS: Try creating an x64_64 + arm64 fat binary Issue #3707 --- .github/workflows/packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index c228329819..baacd8aee0 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -224,7 +224,7 @@ jobs: - 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:x86_64,arm64 qbs.installPrefix:"" projects.Tiled.staticZstd:true - name: Deploy Qt run: | From a5ce04da1de2e75a86b26ccfd7952a39d5296234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 22 May 2023 10:27:38 +0200 Subject: [PATCH 2/4] Don't try to build the Qt 5.12 version for arm64 --- .github/workflows/packages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index baacd8aee0..83ad5f4367 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -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.0 version_suffix: "10.14+" qt_creator_version: 7.0.2 + architectures: x86_64,arm64 env: TILED_VERSION: ${{ needs.version.outputs.version }} @@ -224,7 +226,7 @@ jobs: - name: Build Tiled run: | - qbs install --install-root install config:release qbs.architectures:x86_64,arm64 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: | From 829742bab008452ead6edd6137bf0929d5cc8ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Tue, 27 Jun 2023 18:22:55 +0200 Subject: [PATCH 3/4] Try to build fat / universal zstd library for macOS --- .github/workflows/packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 83ad5f4367..7b9daec5b5 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -221,7 +221,7 @@ 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 From 442d2ad8961ba83287823b538c9a6e8970b7c95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 28 Jun 2023 09:19:57 +0200 Subject: [PATCH 4/4] Updated NEWS.md --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 6c26d8a69b..fe2857805b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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)