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

Enable compilation on apple silicon

See merge request OpenMW/openmw!1399
pull/3224/head
psi29a 3 years ago
commit d5272032a8

@ -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()

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

Loading…
Cancel
Save