Update build and CMakeLists for macOS universal

build

.github/workflows/build.yaml

@@ -13,12 +13,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        
+
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
-        
+
       - name: Setup msys2
         if: runner.os == 'Windows'
         uses: msys2/setup-msys2@v2
@@ -55,9 +55,9 @@ jobs:
       - name: Build for macOS
         if: runner.os == 'macOS'
         run: |
-          mkdir build && cd build && cmake -DAPPLE_X86_64=ON .. && make -j$(sysctl -n hw.ncpu)
+          mkdir build && cd build && cmake .. && make -j$(sysctl -n hw.ncpu)
           chmod +x output/lpac
-          zip -r lpac-macos-x86_64.zip output/*
+          zip -r lpac-macos-universal.zip output/*
         shell: bash
 
       - name: Release
@@ -67,4 +67,4 @@ jobs:
           files: |
             build/lpac-windows-x86_64.zip
             build/lpac-linux-x86_64.tar.gz
-            build/lpac-macos-x86_64.zip
+            build/lpac-macos-universal.zip

CMakeLists.txt

@@ -1,8 +1,9 @@
 option(LINUX_MINGW32 "Build for windows on Linux" OFF)
 
-if (APPLE_X86_64)
-    set(CMAKE_OSX_ARCHITECTURES "x86_64")
-    message(STATUS "Building for macOS x86_64")
+if (APPLE)
+    message(STATUS "Building for macOS")
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+    set(CMAKE_SYSTEM_NAME Darwin)
 endif()
 
 if(LINUX_MINGW32)