summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/cmake.yml7
-rw-r--r--userconfig-runner@Darwin-Clang.cmake1
2 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index bc37c112..3284c146 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -36,7 +36,7 @@ jobs:
version: 1.11.1
if: matrix.os != 'ubuntu-22.04'
- - name: Install Linux Dependencies
+ - name: Install Linux dependencies
run: |
sudo apt -q=2 update
sudo apt install g++-12 gdb ninja-build
@@ -44,6 +44,11 @@ jobs:
sudo apt -q install libsdl2-dev
if: matrix.os == 'ubuntu-22.04'
+ - name: Install OSX dependencies
+ run: |
+ brew install SDL2
+ if: matrix.os == 'macos-12'
+
- name: Configure
run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DFLOORMAT_PRECOMPILED-HEADERS:BOOL=OFF
diff --git a/userconfig-runner@Darwin-Clang.cmake b/userconfig-runner@Darwin-Clang.cmake
index 7f526b9a..e5e59fd8 100644
--- a/userconfig-runner@Darwin-Clang.cmake
+++ b/userconfig-runner@Darwin-Clang.cmake
@@ -1,4 +1,5 @@
sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF)
+sets(BOOL FLOORMAT_SUBMODULE-SDL2 OFF)
add_link_options(-framework IOKit)