Merge branch 'master' into 'master'

Navmeshtool as a Library

See merge request OpenMW/openmw!4354

apps/navmeshtool/CMakeLists.txt

@@ -5,9 +5,21 @@ set(NAVMESHTOOL
 )
 source_group(apps\\navmeshtool FILES ${NAVMESHTOOL})
 
-openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL})
+add_library(openmw-navmeshtool-lib STATIC
+    ${NAVMESHTOOL}
+)
 
-target_link_libraries(openmw-navmeshtool
+if (ANDROID)
+    add_library(openmw-navmeshtool SHARED
+        main.cpp
+    )
+else()
+    openmw_add_executable(openmw-navmeshtool ${NAVMESHTOOL})
+endif()
+
+target_link_libraries(openmw-navmeshtool openmw-navmeshtool-lib)
+
+target_link_libraries(openmw-navmeshtool-lib
     Boost::program_options
     components
 )

apps/navmeshtool/main.cpp

@@ -258,7 +258,11 @@ namespace NavMeshTool
     }
 }
 
+#ifdef ANDROID
+extern "C" int SDL_main(int argc, char* argv[])
+#else
 int main(int argc, char* argv[])
+#endif
 {
     return Debug::wrapApplication(NavMeshTool::runNavMeshTool, argc, argv, NavMeshTool::applicationName);
 }