From 84dd8dd351a346e06ebdf92910edc86af4c332b3 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:52:42 -0500
Subject: [PATCH 1/3] CMake: Link against intl

Fixes compile issue with Apple.
---
 externals/tz/CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/externals/tz/CMakeLists.txt b/externals/tz/CMakeLists.txt
index 1c1ca6c..1bec606 100644
--- a/externals/tz/CMakeLists.txt
+++ b/externals/tz/CMakeLists.txt
@@ -14,14 +14,22 @@ if (NOT EXISTS "${TZ_DIR}" OR NOT EXISTS "${TZIF_LIST_FILE}")
     # separate directory before building.
     file(COPY ${TZ_SOURCE_DIR}/ DESTINATION ${TZ_TMP_SOURCE_DIR})
 
+    if (APPLE)
+        set(TZ_MAKEFLAGS "LDLIBS=-lintl")
+    else()
+        set(TZ_MAKEFLAGS)
+    endif()
+
     execute_process(
         COMMAND
-            ${GNU_MAKE} DESTDIR=${TZ_DIR} install
+            ${GNU_MAKE} DESTDIR=${TZ_DIR} ${TZ_MAKEFLAGS} install
         WORKING_DIRECTORY 
             ${TZ_TMP_SOURCE_DIR}
         COMMAND_ERROR_IS_FATAL ANY
     )
 
+    unset(TZ_MAKEFLAGS)
+
     # Step taken by Arch Linux packaging, but Nintendo apparently skips it
     # execute_process(
     #     COMMAND

From 5fbfd0bb68004b34fcc7cb7fa534a698268d6c2e Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:18:05 -0500
Subject: [PATCH 2/3] github: Check both macos and ubuntu

---
 .github/workflows/cmake.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 048c890..a74d7eb 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -15,7 +15,10 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ubuntu-latest,macos-latest]
+    runs-on: ${{ matrix.platform }}
 
     steps:
     - uses: actions/checkout@v3

From 55ffd1ef803aaa9bd350aee6e9d8054980b74b49 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:24:00 -0500
Subject: [PATCH 3/3] github: Append platform name to archive

Also uses capital R instead of little R in cp command, for Apple.
---
 .github/workflows/cmake.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index a74d7eb..cf75f52 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -39,7 +39,7 @@ jobs:
     - name: Package
       run: |
         mkdir -p ${{github.workspace}}/artifacts
-        cp -rv ${{ env.nx_tzdb_dir }} ${{github.workspace}}/artifacts/
+        cp -Rv ${{ env.nx_tzdb_dir }} ${{github.workspace}}/artifacts/
         
     - name: Version
       run: |
@@ -48,5 +48,5 @@ jobs:
     - name: Upload
       uses: actions/upload-artifact@v3
       with:
-        name: ${{ env.nx_version }}
+        name: ${{ env.nx_version }}_${{ matrix.platform }}
         path: artifacts/nx