Skip to content

Delete lua5.1 DLL #4723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
G-Moris wants to merge 6 commits into
base: master
Choose a base branch
from
+4 −68
Open

Delete lua5.1 DLL #4723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0146808
Update
Feb 23, 2026
364685a
Merge branch 'master' into delete-luadll
G-Moris Feb 23, 2026
ffeee79
Fix style
Feb 24, 2026
12a5782
Merge branch 'delete-luadll' of https://github.com/G-Moris/mtasa-blue…
Feb 24, 2026
26c0c9d
Merge branch 'master' into delete-luadll
G-Moris Feb 28, 2026
c656fd0
Merge branch 'master' into delete-luadll
G-Moris Mar 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Client/loader/Main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@
#ifdef MTA_DEBUG
#define MTA_EXE_NAME "Multi Theft Auto_d.exe"
#define MTA_DLL_NAME "core_d.dll"
#define CHECK_DM_LUA_NAME "mods\\deathmatch\\lua5.1c_d.dll"
#define CHECK_DM_CLIENT_NAME "mods\\deathmatch\\Client_d.dll"
#define LOADER_PROXY_DLL_NAME "mtasa_d.dll"
#define MAETRO32_DLL_NAME "maetro32_d.dll"
#else
#define MTA_EXE_NAME "Multi Theft Auto.exe"
#define MTA_DLL_NAME "core.dll"
#define CHECK_DM_LUA_NAME "mods\\deathmatch\\lua5.1c.dll"
#define CHECK_DM_CLIENT_NAME "mods\\deathmatch\\Client.dll"
#define LOADER_PROXY_DLL_NAME "mtasa.dll"
#define MAETRO32_DLL_NAME "maetro32.dll"
Expand Down
1 change: 0 additions & 1 deletion Client/mods/deathmatch/logic/lua/CLuaManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ CLuaManager::CLuaManager(CClientGame* pClientGame)
#ifdef NDEBUG
#error "NDEBUG should not be defined"
#endif
assert(luaX_is_apicheck_enabled());

// Load the C functions
LoadCFunctions();
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ project "Client Deathmatch"

defines { "LUNASVG_BUILD", "LUA_USE_APICHECK", "SDK_WITH_BCRYPT" }
links {
"Lua_Client", "pcre", "json-c", "ws2_32", "portaudio", "zlib", "cryptopp", "libspeex", "blowfish_bcrypt", "lunasvg",
"Lua", "pcre", "json-c", "ws2_32", "portaudio", "zlib", "cryptopp", "libspeex", "blowfish_bcrypt", "lunasvg",
"../../../vendor/bass/lib/bass",
"../../../vendor/bass/lib/bass_fx",
"../../../vendor/bass/lib/bassmix",
Expand Down
15 changes: 0 additions & 15 deletions Server/mods/deathmatch/logic/CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,21 +702,6 @@ bool CGame::Start(int iArgumentCount, char* szArguments[])
// Encrypt crash dumps for uploading
HandleCrashDumpEncryption();

// Check Windows server is using correctly compiled Lua dll
#ifndef MTA_DEBUG
#ifdef WIN32
HMODULE hModule = LoadLibrary("lua5.1.dll");
// Release server should not have this function
PVOID pFunc = static_cast<PVOID>(GetProcAddress(hModule, "luaX_is_apicheck_enabled"));
FreeLibrary(hModule);
if (pFunc)
{
CLogger::ErrorPrintf("Problem with Lua dll\n");
return false;
}
#endif
#endif

// Read some settings
m_pACLManager->SetFileName(m_pMainConfig->GetAccessControlListFile().c_str());
const SString strServerIP = m_pMainConfig->GetServerIP();
Expand Down
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ project "Deathmatch"

defines { "SDK_WITH_BCRYPT" }
links {
"Lua_Server", "sqlite", "ehs", "cryptopp", "pme", "pcre", "json-c", "zip", "glob", "zlib", "blowfish_bcrypt",
"Lua", "sqlite", "ehs", "cryptopp", "pme", "pcre", "json-c", "zip", "glob", "zlib", "blowfish_bcrypt",
}

vpaths {
Expand Down
50 changes: 2 additions & 48 deletions vendor/lua/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
project "Lua_Server"
project "Lua"
language "C++"
kind "StaticLib"
targetname "lua5.1"
warnings "Off"

Expand All @@ -14,50 +15,3 @@ project "Lua_Server"
"src/**.c",
"src/**.h",
}

defines { "LUA_BUILD_AS_DLL" }

filter "system:windows"
kind "SharedLib"
targetdir(buildpath("server/mods/deathmatch"))

filter "system:not windows"
kind "StaticLib"

filter {"system:windows", "platforms:x64"}
targetdir(buildpath("server/x64"))

filter {"system:windows", "platforms:arm"}
targetdir(buildpath("server/arm"))

filter {"system:windows", "platforms:arm64"}
targetdir(buildpath("server/arm64"))


if os.target() == "windows" then
project "Lua_Client"
language "C++"
kind "SharedLib"
targetname "lua5.1c"
targetdir(buildpath("mods/deathmatch"))

vpaths {
["Headers"] = "**.h",
["Sources"] = "**.c",
["*"] = "premake5.lua"
}

files {
"premake5.lua",
"src/**.c",
"src/**.h",
}

defines {
"LUA_USE_APICHECK",
"LUA_BUILD_AS_DLL"
}

filter "platforms:not x86"
flags { "ExcludeFromBuild" }
end
Loading