diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a01457c..9620b8fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,8 @@ cmake_minimum_required(VERSION 3.10) project(reone) +set (CMAKE_CXX_STANDARD 14) + add_subdirectory(src/external/s3tc) option(BUILD_TOOLS "build tools executable" ON) diff --git a/src/engine/audio/player.cpp b/src/engine/audio/player.cpp index 7b4e0714..b2110122 100644 --- a/src/engine/audio/player.cpp +++ b/src/engine/audio/player.cpp @@ -23,7 +23,11 @@ #include "glm/gtx/norm.hpp" +#if __APPLE__ +#include "OpenAL/al.h" +#else #include "AL/al.h" +#endif #include "../common/log.h" #include "../common/guardutil.h" diff --git a/src/engine/audio/player.h b/src/engine/audio/player.h index 19b688fd..9d4c9306 100644 --- a/src/engine/audio/player.h +++ b/src/engine/audio/player.h @@ -27,7 +27,11 @@ #include +#if __APPLE__ +#include "OpenAL/alc.h" +#else #include "AL/alc.h" +#endif #include "glm/vec3.hpp" diff --git a/src/engine/audio/soundinstance.cpp b/src/engine/audio/soundinstance.cpp index a937e756..afde312f 100644 --- a/src/engine/audio/soundinstance.cpp +++ b/src/engine/audio/soundinstance.cpp @@ -20,7 +20,11 @@ #include #include +#if __APPLE__ +#include "OpenAL/al.h" +#else #include "AL/al.h" +#endif #include "../common/log.h" diff --git a/src/engine/audio/stream.cpp b/src/engine/audio/stream.cpp index dd01200b..3fb07a8d 100644 --- a/src/engine/audio/stream.cpp +++ b/src/engine/audio/stream.cpp @@ -20,7 +20,11 @@ #include #include +#if __APPLE__ +#include "OpenAL/al.h" +#else #include "AL/al.h" +#endif using namespace std;