From 059c20f3ac5cf3feb4d4659bf45b7ee02760ca32 Mon Sep 17 00:00:00 2001 From: iThorgrim <125808072+iThorgrim@users.noreply.github.com> Date: Tue, 2 Sep 2025 12:47:23 +0200 Subject: [PATCH] Fix: Fix Ninja build for LuaJit and Lua51 (#303) --- src/LuaEngine/lmarshal.cpp | 8 +++----- src/lualib/luajit/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/LuaEngine/lmarshal.cpp b/src/LuaEngine/lmarshal.cpp index a0e962e..788db97 100644 --- a/src/LuaEngine/lmarshal.cpp +++ b/src/LuaEngine/lmarshal.cpp @@ -34,11 +34,9 @@ #include #include "ElunaCompat.h" -extern "C" { -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" -} +#if LUA_VERSION_NUM == 501 && !defined(luaL_setfuncs) + #define luaL_setfuncs(L, l, n) luaL_register(L, NULL, l) +#endif #define MAR_TREF 1 #define MAR_TVAL 2 diff --git a/src/lualib/luajit/CMakeLists.txt b/src/lualib/luajit/CMakeLists.txt index 431e44b..64c0cf4 100644 --- a/src/lualib/luajit/CMakeLists.txt +++ b/src/lualib/luajit/CMakeLists.txt @@ -138,7 +138,7 @@ if (UNIX OR APPLE) add_custom_command( OUTPUT ${LUAJIT_LIB_PATH} # COMMAND $(MAKE) -C ${LUA_BIN_FOLDER} PREFIX=${LUA_INSTALL_PATH} - COMMAND $(MAKE) -C ${LUA_BIN_FOLDER} install PREFIX=${LUA_INSTALL_PATH} "CFLAGS=-O2 -fomit-frame-pointer -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-sign-compare -Wno-string-plus-int" + COMMAND make -C ${LUA_BIN_FOLDER} install PREFIX=${LUA_INSTALL_PATH} "CFLAGS=-O2 -fomit-frame-pointer -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-sign-compare -Wno-string-plus-int" ) # endif() add_custom_target(luajit_target DEPENDS ${LUAJIT_LIB_PATH})