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

Enable compilation on apple silicon

See merge request OpenMW/openmw!1399

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

components/detournavigator/recastmeshbuilder.cpp

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