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-11 11:10:29 +07:00 committed by Vsevolod Kremianskii
parent e265fb43d2
commit ef12fff06b
2 changed files with 9 additions and 2 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)

9
src/engine/pch.h
View file

@ -59,8 +59,6 @@
#include "SDL2/SDL_events.h" #include "SDL2/SDL_events.h"
#include "SDL2/SDL_opengl.h" #include "SDL2/SDL_opengl.h"
#include "SDL2/SDL_timer.h" #include "SDL2/SDL_timer.h"
#include "AL/al.h"
#include "AL/alc.h"
#include "glm/ext.hpp" #include "glm/ext.hpp"
#include "glm/glm.hpp" #include "glm/glm.hpp"
@ -69,3 +67,10 @@
#include "glm/gtx/matrix_decompose.hpp" #include "glm/gtx/matrix_decompose.hpp"
#include "glm/gtx/norm.hpp" #include "glm/gtx/norm.hpp"
#include "glm/gtx/transform.hpp" #include "glm/gtx/transform.hpp"
#if __APPLE__
#include "OpenAL/al.h"
#else
#include "AL/al.h"
#endif
#include "AL/alc.h"