mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-12 22:41:49 +00:00
fix: macos uses OpenAL.Framework instead of openal-soft
This commit is contained in:
parent
20155b88d0
commit
cd537cc1cb
3 changed files with 8 additions and 15 deletions
8
.github/workflows/macos.yml
vendored
8
.github/workflows/macos.yml
vendored
|
|
@ -26,10 +26,14 @@ jobs:
|
||||||
brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm
|
brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm
|
||||||
|
|
||||||
- name: Configure
|
- 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
|
- name: Build
|
||||||
run: cmake --build build -t install
|
run: |
|
||||||
|
cmake --build build -t install
|
||||||
|
|
||||||
- name: Make fix_dylibs.sh executable
|
- name: Make fix_dylibs.sh executable
|
||||||
run: chmod +x dev/fix_dylibs.sh
|
run: chmod +x dev/fix_dylibs.sh
|
||||||
|
|
|
||||||
|
|
@ -11,15 +11,9 @@
|
||||||
#include "audio/audio.hpp"
|
#include "audio/audio.hpp"
|
||||||
#include "audio/effects.hpp"
|
#include "audio/effects.hpp"
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <OpenAL/al.h>
|
|
||||||
#include <OpenAL/alc.h>
|
|
||||||
#include <OpenAL/alext.h>
|
|
||||||
#else
|
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
#include <AL/alc.h>
|
#include <AL/alc.h>
|
||||||
#include <AL/alext.h>
|
#include <AL/alext.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace audio {
|
namespace audio {
|
||||||
struct ALBuffer;
|
struct ALBuffer;
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,12 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "typedefs.hpp"
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
#include "typedefs.hpp"
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <OpenAL/al.h>
|
|
||||||
#else
|
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
|
||||||
#define AL_CHECK(STATEMENT) \
|
#define AL_CHECK(STATEMENT) \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue