diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 99466ddab..9fdd8d0b3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -26,10 +26,14 @@ jobs: brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm - name: Configure - run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1 -DVC_BUILD_NAME="${{ inputs.build_name }}" + run: | + cmake -DOPENAL_INCLUDE_DIR=$(brew --prefix openal-soft)/include \ + -DOPENAL_LIBRARY=$(brew --prefix openal-soft)/lib/libopenal.dylib \ + -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1 -DVC_BUILD_NAME="${{ inputs.build_name }}" - name: Build - run: cmake --build build -t install + run: | + cmake --build build -t install - name: Make fix_dylibs.sh executable run: chmod +x dev/fix_dylibs.sh diff --git a/src/audio/AL/ALAudio.hpp b/src/audio/AL/ALAudio.hpp index c2cba3961..6834db0f3 100644 --- a/src/audio/AL/ALAudio.hpp +++ b/src/audio/AL/ALAudio.hpp @@ -11,15 +11,9 @@ #include "audio/audio.hpp" #include "audio/effects.hpp" -#ifdef __APPLE__ -#include -#include -#include -#else #include #include #include -#endif namespace audio { struct ALBuffer; diff --git a/src/audio/AL/alutil.hpp b/src/audio/AL/alutil.hpp index bfa701184..56e5b0f7e 100644 --- a/src/audio/AL/alutil.hpp +++ b/src/audio/AL/alutil.hpp @@ -1,17 +1,12 @@ #pragma once +#include "typedefs.hpp" + #include #include #include -#include "typedefs.hpp" - -#ifdef __APPLE__ -#include -#else #include -#endif - #include #define AL_CHECK(STATEMENT) \