Revert "Lua version change to 5.3.5 (#458)"

This reverts commit 9fa9974159, reversing
changes made to 6ec4106ec7.

CMakeLists.txt

@@ -80,15 +80,14 @@ set(PRJ_SOURCES
     src/ChronoWrapper.cpp
 )
 
-# fix for sol2
+find_package(Lua REQUIRED)
-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 ${LUAJIT_INCLUDE_DIR})
+set(PRJ_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
 # set compile features (e.g. standard version)
 set(PRJ_COMPILE_FEATURES cxx_std_20)
 # set #defines (test enable/disable not included here)
@@ -106,11 +105,9 @@ set(PRJ_LIBRARIES
     libzip::zip
     OpenSSL::SSL OpenSSL::Crypto
     CURL::libcurl
-    lua51
+    ${LUA_LIBRARIES}
 )
 
-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)

src/TConsole.cpp

@@ -260,7 +260,8 @@ 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());
-    Application::Console().WriteRaw(LUA_RELEASE);
+    std::string lua_version = fmt::format("Lua:      v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
+    Application::Console().WriteRaw(lua_version);
     std::string openssl_version = fmt::format("OpenSSL:  v{}.{}.{}", OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH);
     Application::Console().WriteRaw(openssl_version);
 }

src/TLuaEngine.cpp

@@ -65,7 +65,7 @@ TEST_CASE("TLuaEngine ctor & dtor") {
 void TLuaEngine::operator()() {
     RegisterThread("LuaEngine");
     // lua engine main thread
-    beammp_infof(LUA_RELEASE);
+    beammp_infof("Lua v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
     CollectAndInitPlugins();
 
     Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);

vcpkg.json

@@ -14,8 +14,7 @@
     "openssl",
     "rapidjson",
     "sol2",
-    "curl",
+    "curl"
-    "luajit"
   ],
   "overrides": [
     {