wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix builds on macOS

Browse source
This commit is contained in:
William Brawner 2021-06-10 17:13:59 -06:00
parent 2fb9bced40
commit 6b0c77d50e
5 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -16,6 +16,8 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(reone) project(reone)
set (CMAKE_CXX_STANDARD 14)
add_subdirectory(src/external/s3tc) add_subdirectory(src/external/s3tc)
option(BUILD_TOOLS "build tools executable" ON) option(BUILD_TOOLS "build tools executable" ON)

4
src/engine/audio/player.cpp
View file

@ -23,7 +23,11 @@
#include "glm/gtx/norm.hpp" #include "glm/gtx/norm.hpp"
#if __APPLE__
#include "OpenAL/al.h"
#else
#include "AL/al.h" #include "AL/al.h"
#endif
#include "../common/log.h" #include "../common/log.h"
#include "../common/guardutil.h" #include "../common/guardutil.h"

4
src/engine/audio/player.h
View file

@ -27,7 +27,11 @@
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#if __APPLE__
#include "OpenAL/alc.h"
#else
#include "AL/alc.h" #include "AL/alc.h"
#endif
#include "glm/vec3.hpp" #include "glm/vec3.hpp"

4
src/engine/audio/soundinstance.cpp
View file

@ -20,7 +20,11 @@
#include <stdexcept> #include <stdexcept>
#include <utility> #include <utility>
#if __APPLE__
#include "OpenAL/al.h"
#else
#include "AL/al.h" #include "AL/al.h"
#endif
#include "../common/log.h" #include "../common/log.h"

4
src/engine/audio/stream.cpp
View file

@ -20,7 +20,11 @@
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#if __APPLE__
#include "OpenAL/al.h"
#else
#include "AL/al.h" #include "AL/al.h"
#endif
using namespace std; using namespace std;