Browse Source

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

Sasha Szpakowski 1 year ago
parent
commit
696007ee39
2 changed files with 1 additions and 6 deletions
  1. 1 1
      src/love.cpp
  2. 0 5
      src/modules/love/love.cpp

+ 1 - 1
src/love.cpp

@@ -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
 	// 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");
 	lua_getglobal(L, "require");
 	lua_pushstring(L, "love.jitsetup");

+ 0 - 5
src/modules/love/love.cpp

@@ -410,11 +410,6 @@ int luaopen_love(lua_State *L)
 	for (int i = 0; modules[i].name != nullptr; i++)
 		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_insistglobal(L, "love");