mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2024-12-29 03:19:44 +00:00
Code Issues Projects Releases Wiki Activity

Enable compilation on apple silicon

Browse Source
This commit is contained in:
Brian Kelley 2021-11-15 19:01:52 +00:00 committed by psi29a
parent b20a413865
commit ee41b94a73
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -709,8 +709,10 @@ if (WIN32)
endif() endif()
if (BUILD_OPENMW AND APPLE) if (BUILD_OPENMW AND APPLE)
if (USE_LUAJIT)
# Without these flags LuaJit crashes on startup on OSX # Without these flags LuaJit crashes on startup on OSX
set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000") set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
endif(USE_LUAJIT)
target_compile_definitions(components PRIVATE GL_SILENCE_DEPRECATION=1) target_compile_definitions(components PRIVATE GL_SILENCE_DEPRECATION=1)
target_compile_definitions(openmw PRIVATE GL_SILENCE_DEPRECATION=1) target_compile_definitions(openmw PRIVATE GL_SILENCE_DEPRECATION=1)
endif() endif()

1
components/detournavigator/recastmeshbuilder.cpp
View File

@ -18,6 +18,7 @@
#include <cassert> #include <cassert>
#include <array> #include <array>
#include <vector> #include <vector>
#include <sstream>
namespace DetourNavigator namespace DetourNavigator
{ {