q98/LuaJIT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cmakelists

Browse Source
This commit is contained in:
fesily 2023-08-25 10:04:15 +08:00
parent c87cb013df
commit 3e92b7e0c6
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -273,6 +273,17 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/buildvm_arch.h
DEPENDS ${LUAJIT_DIR}/dynasm/dynasm.lua minilua
)
add_custom_command(OUTPUT ${LUAJIT_DIR}/src/luajit_relver.txt
COMMAND git show -s --format=%ct > ${LUAJIT_DIR}/src/luajit_relver.txt
WORKING_DIRECTORY ${LUAJIT_DIR}/src/
)
add_custom_command(OUTPUT ${LUAJIT_DIR}/src/luajit.h
COMMAND minilua ${LUAJIT_DIR}/src/host/genversion.lua
DEPENDS ${LUAJIT_DIR}/src/host/genversion.lua minilua ${LUAJIT_DIR}/src/luajit_relver.txt
WORKING_DIRECTORY ${LUAJIT_DIR}/src/
)
## Source Lists
SET(SRC_LJLIB
${LUAJIT_DIR}/src/lib_base.c
@ -297,6 +308,7 @@ file (GLOB_RECURSE SRC_LJCORE "${LUAJIT_DIR}/src/lj_*.c")
list (APPEND SRC_LJCORE ${SRC_LJLIB} ${SRC_LIBAUX})
file (GLOB_RECURSE SRC_BUILDVM "${LUAJIT_DIR}/src/host/buildvm*.c")
list (APPEND SRC_BUILDVM ${CMAKE_CURRENT_BINARY_DIR}/buildvm_arch.h)
list (APPEND SRC_BUILDVM ${LUAJIT_DIR}/src/luajit.h)
## GENERATE
ADD_EXECUTABLE(buildvm ${SRC_BUILDVM})

8
src/lib_init.c
View File

@ -89,11 +89,11 @@ static void handle_luainit(lua_State *L)
{
const char *init = getenv(LUA_INIT);
if (init == NULL)
return LUA_OK;
else if (init[0] == '@')
return luaL_dofile(L, init+1);
return;
if (init[0] == '@')
luaL_dofile(L, init+1);
else
return luaL_dostring(L, init);
luaL_dostring(L, init);
}