Skip to content

Commit b1670dd

Browse files
leso-knleafo
authored andcommitted
Fix C module loading on windows
1 parent 33d9166 commit b1670dd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

main.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,21 +173,21 @@ async function install_plain_lua_windows(luaExtractPath, luaInstallPath, luaVers
173173
}
174174
})
175175

176-
objs["lua"] = [ ...objs["lua"], ...objs["lib"] ]
177-
objs["luac"] = [ ...objs["luac"], ...objs["lib"] ]
178-
179176
let luaXYZ = luaVersion.split(".")
180177
let libFile = "lua" + luaXYZ[0] + luaXYZ[1] + ".lib"
181178
let dllFile = "lua" + luaXYZ[0] + luaXYZ[1] + ".dll"
182179

180+
objs["lua"] = [ ...objs["lua"], libFile ]
181+
objs["luac"] = [ ...objs["luac"], ...objs["lib"] ]
182+
183183
await msvc_link(luaExtractPath, "link /nologo /DLL", dllFile, objs["lib"]);
184184
await msvc_link(luaExtractPath, "link /nologo", "luac.exe", objs["luac"]);
185185
await msvc_link(luaExtractPath, "link /nologo", "lua.exe", objs["lua"]);
186186

187187
const luaHpp = (await exists(pathJoin(src, "lua.hpp"))) ? "lua.hpp" : "../etc/lua.hpp"
188188
const headers = [ "lua.h", "luaconf.h", "lualib.h", "lauxlib.h", luaHpp ]
189189

190-
await install_files(pathJoin(luaInstallPath, "bin"), luaExtractPath, [ "lua.exe", "luac.exe" ])
190+
await install_files(pathJoin(luaInstallPath, "bin"), luaExtractPath, [ "lua.exe", "luac.exe", dllFile ])
191191
await install_files(pathJoin(luaInstallPath, "lib"), luaExtractPath, [ dllFile, libFile ])
192192
await install_files(pathJoin(luaInstallPath, "include"), src, headers)
193193
}

0 commit comments

Comments
 (0)