mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:23:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev/apple-silicon' into 'master'

Browse source 
Enable compilation on apple silicon

See merge request OpenMW/openmw!1399
This commit is contained in:
psi29a 2021-11-15 19:01:52 +00:00
commit d5272032a8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -709,8 +709,10 @@ if (WIN32)
endif() endif()
if (BUILD_OPENMW AND APPLE) if (BUILD_OPENMW AND APPLE)
# Without these flags LuaJit crashes on startup on OSX if (USE_LUAJIT)
set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000") # Without these flags LuaJit crashes on startup on OSX
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
{ {