Merge branch 'master' into 'master'

Navmeshtool as a Library See merge request OpenMW/openmw!4354
OpenMW · Sep 6, 2024 · 8992a9f · 8992a9f
2 parents 46cbee2 + e920325
commit 8992a9f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/apps/navmeshtool/CMakeLists.txt b/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}
+)
+
+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
+target_link_libraries(openmw-navmeshtool-lib
     Boost::program_options
     components
 )

diff --git a/apps/navmeshtool/main.cpp b/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);
 }