Merge pull request #308 from Dnawrkshp/master

Add Mac OS build support

Author: chaoticgd

.github/workflows/release.yml

@@ -16,20 +16,34 @@ jobs:
         sys: 
           - { os: windows-latest, shell: pwsh }
           - { os: ubuntu-latest,  shell: bash }
+          - { os: macos-latest,   shell: bash }
 
     steps:
     - name: Checkout
       uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
-    - name: Install Dependencies
+    - name: Install Ubuntu Dependencies
       if: ${{ matrix.sys.os == 'ubuntu-latest' }}
       run: sudo apt update && sudo apt install extra-cmake-modules libwayland-dev libxkbcommon-dev wayland-protocols xorg-dev zenity
 
-    - name: Configure CMake
+    - name: Install MacOS Dependencies
+      if: ${{ matrix.sys.os == 'macos-latest' }}
+      run: brew update && brew install cmake libpng zlib pkg-config
+
+    - name: Configure Ubuntu CMake
+      if: ${{ matrix.sys.os == 'ubuntu-latest' }}
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DZIP_RELEASE=1
 
+    - name: Configure Windows CMake
+      if: ${{ matrix.sys.os == 'windows-latest' }}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DZIP_RELEASE=1
+
+    - name: Configure MacOS CMake
+      if: ${{ matrix.sys.os == 'macos-latest' }}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DPNG_ARM_NEON=off -DZIP_RELEASE=1
+
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 

.github/workflows/test.yml

@@ -17,20 +17,34 @@ jobs:
         sys: 
           - { os: windows-latest, shell: pwsh }
           - { os: ubuntu-latest,  shell: bash }
+          - { os: macos-latest,   shell: bash }
 
     steps:
     - name: Checkout
       uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
-    - name: Install Dependencies
+    - name: Install Ubuntu Dependencies
       if: ${{ matrix.sys.os == 'ubuntu-latest' }}
       run: sudo apt update && sudo apt install extra-cmake-modules libwayland-dev libxkbcommon-dev wayland-protocols xorg-dev zenity
 
-    - name: Configure CMake
+    - name: Install MacOS Dependencies
+      if: ${{ matrix.sys.os == 'macos-latest' }}
+      run: brew update && brew install cmake libpng zlib pkg-config
+
+    - name: Configure Ubuntu CMake
+      if: ${{ matrix.sys.os == 'ubuntu-latest' }}
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
+    - name: Configure Windows CMake
+      if: ${{ matrix.sys.os == 'windows-latest' }}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Configure MacOS CMake
+      if: ${{ matrix.sys.os == 'macos-latest' }}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DPNG_ARM_NEON=off
+
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 2
 

.github/workflows/unstable.yml

@@ -15,20 +15,34 @@ jobs:
         sys: 
           - { os: windows-latest, shell: pwsh }
           - { os: ubuntu-latest,  shell: bash }
+          - { os: macos-latest,   shell: bash }
 
     steps:
     - name: Checkout
       uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
-    - name: Install Dependencies
+    - name: Install Ubuntu Dependencies
       if: ${{ matrix.sys.os == 'ubuntu-latest' }}
       run: sudo apt update && sudo apt install extra-cmake-modules libwayland-dev libxkbcommon-dev wayland-protocols xorg-dev zenity
 
-    - name: Configure CMake
+    - name: Install MacOS Dependencies
+      if: ${{ matrix.sys.os == 'macos-latest' }}
+      run: brew update && brew install cmake libpng zlib pkg-config
+
+    - name: Configure Ubuntu CMake
+      if: ${{ matrix.sys.os == 'ubuntu-latest' }}
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DZIP_RELEASE=1
 
+    - name: Configure Windows CMake
+      if: ${{ matrix.sys.os == 'windows-latest' }}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DZIP_RELEASE=1
+
+    - name: Configure MacOS CMake
+      if: ${{ matrix.sys.os == 'macos-latest' }}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DPNG_ARM_NEON=off -DZIP_RELEASE=1
+
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 2
 

cmake/wrench_compiler_flags.cmake

@@ -1,4 +1,4 @@
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
     if (CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /MP")
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2")
@@ -10,8 +10,17 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
     endif()
 
     if(NOT PORTABLE_BUILD)
-        # Both frontends support -march=native
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
+        if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+            # Apple Silicon / Intel mac
+            if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=apple-m1")
+            else()
+                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
+            endif()
+        else()
+            # Windows & Linux support -march=native
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
+        endif()
     endif()
 elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-sign-compare")
@@ -32,7 +41,7 @@ else()
     message(SEND_ERROR "No flags available for C Compiler ${CMAKE_C_COMPILER_ID}.")
 endif()
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /EHsc /MP")
         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O2")
@@ -53,7 +62,17 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -g")
 
     if(NOT PORTABLE_BUILD)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+        if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+            # Apple Silicon / Intel mac
+            if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+                set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -mcpu=apple-m1")
+            else()
+                set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -march=native")
+            endif()
+        else()
+            # Windows & Linux support -march=native
+            set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -march=native")
+        endif()
     endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	# /W4 - enable all non-default-disabled warnings (-Wall equivalent)