From ee41b94a73e982dfb5023e9fd90ead58cba588b6 Mon Sep 17 00:00:00 2001 From: Brian Kelley Date: Mon, 15 Nov 2021 19:01:52 +0000 Subject: [PATCH] Enable compilation on apple silicon --- CMakeLists.txt | 6 ++++-- components/detournavigator/recastmeshbuilder.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ee87b2ce..067b645a39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -709,8 +709,10 @@ if (WIN32) endif() if (BUILD_OPENMW AND APPLE) - # Without these flags LuaJit crashes on startup on OSX - set_target_properties(openmw PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000") + if (USE_LUAJIT) + # 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(openmw PRIVATE GL_SILENCE_DEPRECATION=1) endif() diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp index ae3458a011..8a0d30616d 100644 --- a/components/detournavigator/recastmeshbuilder.cpp +++ b/components/detournavigator/recastmeshbuilder.cpp @@ -18,6 +18,7 @@ #include #include #include +#include namespace DetourNavigator {