aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobil4sk <tobil4sk@outlook.com>2025-02-21 16:47:29 +0000
committerGitHub <noreply@github.com>2025-02-21 13:47:29 -0300
commitf87af07f1bec82a312c3c82e92627c41db9b9bc9 (patch)
tree0388ee2f0208d53973ce7f1d0643bb822ed9ea4d
parent91dc933e27562c980723d0f6fba3406ef703f187 (diff)
downloadluarocks-f87af07f1bec82a312c3c82e92627c41db9b9bc9.tar.gz
luarocks-f87af07f1bec82a312c3c82e92627c41db9b9bc9.tar.bz2
luarocks-f87af07f1bec82a312c3c82e92627c41db9b9bc9.zip
Fix LUA_LIBDIR for msvc installations (#1744)
The order here was swapped in #1701 to fix mingw builds (see #1700), but this broke MSVC installations which need to link against the .lib, which defines the dll imports.
-rw-r--r--install.bat4
1 files changed, 3 insertions, 1 deletions
diff --git a/install.bat b/install.bat
index 65456583..37d69b9c 100644
--- a/install.bat
+++ b/install.bat
@@ -343,8 +343,10 @@ local function look_for_link_libraries(directory)
343 local directories 343 local directories
344 if vars.LUA_LIBDIR then 344 if vars.LUA_LIBDIR then
345 directories = {vars.LUA_LIBDIR} 345 directories = {vars.LUA_LIBDIR}
346 else 346 elseif USE_MINGW then
347 directories = {directory, directory .. "\\bin", directory .. "\\lib"} 347 directories = {directory, directory .. "\\bin", directory .. "\\lib"}
348 else
349 directories = {directory, directory .. "\\lib", directory .. "\\bin"}
348 end 350 end
349 351
350 for _, dir in ipairs(directories) do 352 for _, dir in ipairs(directories) do