Import Lua functions from binaries; Linux support

tederis · Oct 22, 2023 · 3c9c19a · 3c9c19a
1 parent 5678da5
commit 3c9c19a
Show file tree

Hide file tree

Showing 19 changed files with 1,292 additions and 1,413 deletions.
diff --git a/premake5.lua b/premake5.lua
@@ -7,6 +7,7 @@ workspace "mta-navigation"
 
     language "C++"
     staticruntime "off"
+    characterset "MBCS"
 
     defines {  
         "_CRT_SECURE_NO_WARNINGS",
@@ -32,6 +33,7 @@ workspace "mta-navigation"
     filter "system:linux"
         cppdialect "C++2a"
         links "pthread"
+        defaultplatform "x64"
     filter "system:windows"
         cppdialect "C++20"
         largeaddressaware "on"
@@ -135,14 +137,9 @@ workspace "mta-navigation"
                 defines "EXPORT_NATIVE_API"
 
             filter { "options:navapi=lua" }
-                links "module-sdk"
-                includedirs "vendor/lua"
-                defines "EXPORT_LUA_API"
-
-            filter {"system:windows", "platforms:x86", "options:navapi=lua" }
-                links "vendor/lua/lib/lua5.1.lib"
-            filter {"system:windows", "platforms:x64", "options:navapi=lua" }
-                links "vendor/lua/lib/lua5.1_64.lib"
+                links { "module-sdk", "Lua" }
+                includedirs "vendor/lua/src"
+                defines "EXPORT_LUA_API"       
 
             filter "configurations:Debug"
                 defines { "DEBUG" }
@@ -158,6 +155,7 @@ workspace "mta-navigation"
         include "vendor/pugixml"
 
         if _OPTIONS["navapi"] == "lua" then
+            include "vendor/lua"
             include "vendor/module-sdk"
         end
 
diff --git a/source/module/Module.cpp b/source/module/Module.cpp
@@ -19,7 +19,9 @@ MTAEXPORT bool InitModule(ILuaModuleManager10* pManager, char* szModuleName, cha
     strncpy(szAuthor, MODULE_AUTHOR, MAX_INFO_LENGTH);
     (*fVersion) = MODULE_VERSION;
 
-    Navigation::GetInstance().Initialize();
+    VluaL_init();
+
+    Navigation::GetInstance().Initialize();    
 
     return true;
 }
@@ -49,6 +51,9 @@ MTAEXPORT bool DoPulse(void)
 MTAEXPORT bool ShutdownModule(void)
 {
     Navigation::GetInstance().Shutdown();
+
+    VluaL_close();
+
     return true;
 }
 

diff --git a/vendor/lua/LICENSE.txt b/vendor/lua/LICENSE.txt
diff --git a/vendor/lua/lauxlib.h b/vendor/lua/lauxlib.h
diff --git a/vendor/lua/lib/lua5.1.lib b/vendor/lua/lib/lua5.1.lib
diff --git a/vendor/lua/lib/lua5.1_64.lib b/vendor/lua/lib/lua5.1_64.lib