From 43e86a1e228e3e357c0113d07417418bc8ac033e Mon Sep 17 00:00:00 2001
From: Tixx <83774803+WiserTixx@users.noreply.github.com>
Date: Thu, 19 Feb 2026 22:08:06 +0100
Subject: [PATCH] Change to luajit

---
 CMakeLists.txt     | 9 ++++++---
 src/TConsole.cpp   | 3 +--
 src/TLuaEngine.cpp | 2 +-
 vcpkg.json         | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67e758d..b9f07a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,14 +80,15 @@ set(PRJ_SOURCES
     src/ChronoWrapper.cpp
 )
 
-find_package(Lua REQUIRED)
+# fix for sol2
+find_path(LUAJIT_INCLUDE_DIR lua.hpp PATH_SUFFIXES luajit)
 
 # set the source file containing main()
 set(PRJ_MAIN src/main.cpp)
 # set the source file containing the test's main
 set(PRJ_TEST_MAIN test/test_main.cpp)
 # set include paths not part of libraries
-set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+set(PRJ_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
 # set compile features (e.g. standard version)
 set(PRJ_COMPILE_FEATURES cxx_std_20)
 # set #defines (test enable/disable not included here)
@@ -105,9 +106,11 @@ set(PRJ_LIBRARIES
     libzip::zip
     OpenSSL::SSL OpenSSL::Crypto
     CURL::libcurl
-    ${LUA_LIBRARIES}
+    lua51
 )
 
+link_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib)
+
 # add dependency find_package calls and similar here
 find_package(fmt CONFIG REQUIRED)
 find_package(OpenSSL REQUIRED)
diff --git a/src/TConsole.cpp b/src/TConsole.cpp
index fb1dc8b..9017f92 100644
--- a/src/TConsole.cpp
+++ b/src/TConsole.cpp
@@ -260,8 +260,7 @@ void TConsole::Command_Version(const std::string& cmd, const std::vector<std::st
 
     Application::Console().WriteRaw("Platform: " + platform);
     Application::Console().WriteRaw("Server:   v" + Application::ServerVersionString());
-    std::string lua_version = fmt::format("Lua:      v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
-    Application::Console().WriteRaw(lua_version);
+    Application::Console().WriteRaw(LUA_RELEASE);
     std::string openssl_version = fmt::format("OpenSSL:  v{}.{}.{}", OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH);
     Application::Console().WriteRaw(openssl_version);
 }
diff --git a/src/TLuaEngine.cpp b/src/TLuaEngine.cpp
index 49dd445..4cb8e87 100644
--- a/src/TLuaEngine.cpp
+++ b/src/TLuaEngine.cpp
@@ -65,7 +65,7 @@ TEST_CASE("TLuaEngine ctor & dtor") {
 void TLuaEngine::operator()() {
     RegisterThread("LuaEngine");
     // lua engine main thread
-    beammp_infof("Lua v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
+    beammp_infof(LUA_RELEASE);
     CollectAndInitPlugins();
 
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
diff --git a/vcpkg.json b/vcpkg.json
index e3ab1da..b8aefc6 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -15,7 +15,7 @@
     "rapidjson",
     "sol2",
     "curl",
-    "lua"
+    "luajit"
   ],
   "overrides": [
     {