azerothcore · iThorgrim · Nov 21, 2025 · Nov 29, 2025 · Nov 29, 2025 · Nov 29, 2025
diff --git a/.github/workflows/core-build-base.yml b/.github/workflows/core-build-base.yml
@@ -74,6 +74,7 @@ jobs:
             -I src/ \
             --suppress=*:src/lualib/* \
             --suppress=*:src/LuaEngine/libs/* \
+            --suppress=*:src/sol/* \
             --output-file=report.txt \
             .
           if [ -s report.txt ]; then

diff --git a/src/LuaEngine/ALECompat.cpp b/src/LuaEngine/ALECompat.cpp
diff --git a/src/LuaEngine/ALECompat.h b/src/LuaEngine/ALECompat.h
diff --git a/src/LuaEngine/ALEEventMgr.cpp b/src/LuaEngine/ALEEventMgr.cpp
@@ -8,11 +8,7 @@
 #include "LuaEngine.h"
 #include "Object.h"
 
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-};
+#include <sol/sol.hpp>
 
 ALEEventProcessor::ALEEventProcessor(ALE** _E, WorldObject* _obj) : m_time(0), obj(_obj), E(_E)
 {

diff --git a/src/LuaEngine/ALEIncludes.h b/src/LuaEngine/ALEIncludes.h
@@ -53,6 +53,8 @@
 #include "ArenaTeam.h"
 #include "WorldSessionMgr.h"
 
+#include <sol/sol.hpp>
+
 typedef Opcodes                 OpcodesList;
 
 /*

diff --git a/src/LuaEngine/ALETemplate.h b/src/LuaEngine/ALETemplate.h
@@ -7,14 +7,8 @@
 #ifndef _ALE_TEMPLATE_H
 #define _ALE_TEMPLATE_H
 
-extern "C"
-{
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-};
+#include <sol/sol.hpp>
 #include "LuaEngine.h"
-#include "ALECompat.h"
 #include "ALEUtility.h"
 #include "SharedDefines.h"
 

diff --git a/src/LuaEngine/BindingMap.h b/src/LuaEngine/BindingMap.h
@@ -12,12 +12,7 @@
 #include "ALEUtility.h"
 #include <type_traits>
 
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-};
-
+#include <sol/sol.hpp>
 
 /*
  * A set of bindings from keys of type `K` to Lua references.

diff --git a/src/LuaEngine/HttpManager.cpp b/src/LuaEngine/HttpManager.cpp
@@ -1,9 +1,5 @@
 #include <thread>
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-};
+#include <sol/sol.hpp>
 
 #define CPPHTTPLIB_OPENSSL_SUPPORT
 

diff --git a/src/LuaEngine/LuaEngine.cpp b/src/LuaEngine/LuaEngine.cpp
@@ -8,7 +8,6 @@
 #include "LuaEngine.h"
 #include "BindingMap.h"
 #include "Chat.h"
-#include "ALECompat.h"
 #include "ALEEventMgr.h"
 #include "ALEIncludes.h"
 #include "ALETemplate.h"
@@ -31,16 +30,6 @@
 #include <sys/stat.h>
 #include <unordered_map>
 
-extern "C"
-{
-// Base lua libraries
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-
-// Additional lua libraries
-};
-
 ALE::ScriptList ALE::lua_scripts;
 ALE::ScriptList ALE::lua_extensions;
 std::string ALE::lua_folderpath;
@@ -446,7 +435,7 @@ bool ALE::CompileScriptToGlobalCache(const std::string& filepath)
     BytecodeWriter writer;
     writer.buffer = &cacheEntry.bytecode;
 
-    int dumpResult = lua_dump(tempL, BytecodeWriter::writer, &writer);
+    int dumpResult = lua_dump(tempL, BytecodeWriter::writer, &writer, 0);
     if (dumpResult != LUA_OK || cacheEntry.bytecode.empty())
     {
         globalBytecodeCache.erase(filepath);
@@ -504,7 +493,7 @@ bool ALE::CompileMoonScriptToGlobalCache(const std::string& filepath)
     BytecodeWriter writer;
     writer.buffer = &cacheEntry.bytecode;
 
-    int dumpResult = lua_dump(tempL, BytecodeWriter::writer, &writer);
+    int dumpResult = lua_dump(tempL, BytecodeWriter::writer, &writer, 0);
     if (dumpResult != LUA_OK || cacheEntry.bytecode.empty())
     {
         globalBytecodeCache.erase(filepath);

diff --git a/src/LuaEngine/LuaEngine.h b/src/LuaEngine/LuaEngine.h
@@ -32,10 +32,7 @@
 #include <ctime>
 #include <unordered_map>
 
-extern "C"
-{
-#include <lua.h>
-};
+#include <sol/sol.hpp>
 
 struct ItemTemplate;
 typedef BattlegroundTypeId BattleGroundTypeId;

diff --git a/src/LuaEngine/LuaFunctions.cpp b/src/LuaEngine/LuaFunctions.cpp
@@ -4,11 +4,6 @@
 * Please see the included DOCS/LICENSE.md for more information
 */
 
-extern "C"
-{
-#include "lua.h"
-};
-
 // ALE
 #include "LuaEngine.h"
 #include "ALEEventMgr.h"

diff --git a/src/LuaEngine/lmarshal.cpp b/src/LuaEngine/lmarshal.cpp
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <cstdint>
-#include "ALECompat.h"
+#include "lmarshal.h"
 
 #if LUA_VERSION_NUM == 501 && !defined(luaL_setfuncs)
     #define luaL_setfuncs(L, l, n) luaL_register(L, NULL, l)
@@ -218,7 +218,7 @@ static void mar_encode_value(lua_State *L, mar_Buffer *buf, int val, size_t *idx
 
             lua_pushvalue(L, -1);
             buf_init(L, &rec_buf);
-            lua_dump(L, (lua_Writer)buf_write, &rec_buf);
+            lua_dump(L, (lua_Writer)buf_write, &rec_buf, 0);
 
             buf_write(L, (const char*)&tag, MAR_CHR, buf);
             buf_write(L, (const char*)&rec_buf.head, MAR_I32, buf);

diff --git a/src/LuaEngine/lmarshal.h b/src/LuaEngine/lmarshal.h
@@ -4,9 +4,7 @@
  * Please see the included DOCS/LICENSE.md for more information
  */
 
-extern "C" {
-#include "lua.h"
-}
+#include <sol/sol.hpp>
 
 int mar_encode(lua_State* L);
 int mar_decode(lua_State* L);
diff --git a/src/lualib/lua/CMakeLists.txt b/src/lualib/lua/CMakeLists.txt
@@ -115,8 +115,18 @@ elseif (UNIX)
   set_target_properties(lualib PROPERTIES OUTPUT_NAME ${LUA_VERSION})
 endif()
 
-add_executable(lua_interpreter ${LUA_SOURCE_FOLDER}/lua.c)
-target_link_libraries(lua_interpreter lualib)
+if (LUA_STATIC)
+  add_executable(lua_interpreter ${LUA_SOURCE_FOLDER}/lua.c)
+  target_link_libraries(lua_interpreter lualib)
+else()
+  add_executable(lua_interpreter ${LUA_SOURCE_FOLDER}/lua.c ${LOCAL_SOURCES_C})
+  target_include_directories(lua_interpreter PRIVATE "${LUA_SOURCE_FOLDER}")
+  if(APPLE)
+    target_link_libraries(lua_interpreter readline)
+  else()
+    target_link_libraries(lua_interpreter m ${CMAKE_DL_LIBS})
+  endif()
+endif()
 target_compile_definitions(lua_interpreter PRIVATE _CRT_SECURE_NO_WARNINGS)
 if (NOT WIN32)
   target_compile_options(lua_interpreter PRIVATE -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-sign-compare -Wno-string-plus-int)
@@ -129,8 +139,18 @@ else()
   install(TARGETS lua_interpreter DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 endif()
 
-add_executable(lua_compiler ${LUA_SOURCE_FOLDER}/luac.c)
-target_link_libraries(lua_compiler lualib)
+if (LUA_STATIC)
+  add_executable(lua_compiler ${LUA_SOURCE_FOLDER}/luac.c)
+  target_link_libraries(lua_compiler lualib)
+else()
+  add_executable(lua_compiler ${LUA_SOURCE_FOLDER}/luac.c ${LOCAL_SOURCES_C})
+  target_include_directories(lua_compiler PRIVATE "${LUA_SOURCE_FOLDER}")
+  if(APPLE)
+    target_link_libraries(lua_compiler readline)
+  else()
+    target_link_libraries(lua_compiler m ${CMAKE_DL_LIBS})
+  endif()
+endif()
 target_compile_definitions(lua_compiler PRIVATE _CRT_SECURE_NO_WARNINGS)
 if (NOT WIN32)
   target_compile_options(lua_compiler PRIVATE -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-sign-compare -Wno-string-plus-int)

diff --git a/src/lualib/luajit/CMakeLists.txt b/src/lualib/luajit/CMakeLists.txt
@@ -66,7 +66,7 @@ if (WIN32)
     set_target_properties(lualib
     PROPERTIES
     IMPORTED_LOCATION ${LUA_BIN_FOLDER}/src/lua51.lib
-    INTERFACE_INCLUDE_DIRECTORIES "${LUA_SRC_FOLDER}/src"
+    INTERFACE_INCLUDE_DIRECTORIES "${LUA_BIN_FOLDER}/src"
     INTERFACE_COMPILE_DEFINITIONS "LUAJIT_VERSION=1"
     )
 
@@ -155,13 +155,11 @@ if (UNIX OR APPLE)
   set_target_properties(lualib
   PROPERTIES
   # IMPORTED_LOCATION ${LUAJIT_LIB_PATH} # cmake bullshit. spent days figuring this and turns out set_target_properties does squat shit while set_property works fine.
-  INTERFACE_INCLUDE_DIRECTORIES "${LUA_SRC_FOLDER}/src"
+  INTERFACE_INCLUDE_DIRECTORIES "${LUA_BIN_FOLDER}/src"
   INTERFACE_COMPILE_DEFINITIONS "LUAJIT_VERSION=1"
   )
   set_property(TARGET lualib PROPERTY IMPORTED_LOCATION ${LUAJIT_LIB_PATH})
 
   # install generated files
   install(DIRECTORY ${LUA_INSTALL_PATH}/ DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
-
-