LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 20:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't unconditionally run love.jitsetup when love is used as a library

Browse Source
This commit is contained in:
Sasha Szpakowski
2023-11-27 23:14:36 -04:00
parent 6a298a74c2
commit 696007ee39
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/love.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ static DoneAction runlove(int argc, char **argv, int &retval)
// LuaJIT-specific setup needs to be done as early as possible - before // LuaJIT-specific setup needs to be done as early as possible - before
// get_app_arguments because that loads external library code. This is also // get_app_arguments because that loads external library code. This is also
// loaded inside require("love"). Note that it doesn't use the love table. // loaded inside love's Lua threads. Note that it doesn't use the love table.
love_preload(L, luaopen_love_jitsetup, "love.jitsetup"); love_preload(L, luaopen_love_jitsetup, "love.jitsetup");
lua_getglobal(L, "require"); lua_getglobal(L, "require");
lua_pushstring(L, "love.jitsetup"); lua_pushstring(L, "love.jitsetup");
src/modules/love/love.cpp
-5
View File
@@ -410,11 +410,6 @@ int luaopen_love(lua_State *L)
for (int i = 0; modules[i].name != nullptr; i++) for (int i = 0; modules[i].name != nullptr; i++)
love::luax_preload(L, modules[i].func, modules[i].name); love::luax_preload(L, modules[i].func, modules[i].name);
// jitsetup is also loaded in the love executable runlove function. It's
// needed here too for threads. Note that it doesn't use the love table.
love::luax_require(L, "love.jitsetup");
lua_pop(L, 1);
love::luax_insistpinnedthread(L); love::luax_insistpinnedthread(L);
love::luax_insistglobal(L, "love"); love::luax_insistglobal(L, "love");