From 70fc8436ed28346e94513fc857933edba56029a7 Mon Sep 17 00:00:00 2001 From: Tixx <83774803+WiserTixx@users.noreply.github.com> Date: Sun, 18 Jan 2026 23:32:54 +0100 Subject: [PATCH 1/2] Remove lua version lock --- vcpkg.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 1814b289..e3ab1daa 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -21,10 +21,6 @@ { "name": "sol2", "version": "3.3.1" - }, - { - "name": "lua", - "version": "5.3.5#6" } ], "builtin-baseline": "5bf0c55239da398b8c6f450818c9e28d36bf9966" 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 2/2] 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 67e758d6..b9f07a38 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 fb1dc8b0..9017f923 100644 --- a/src/TConsole.cpp +++ b/src/TConsole.cpp @@ -260,8 +260,7 @@ void TConsole::Command_Version(const std::string& cmd, const std::vector