From d5d6c6036790239eaff211a1b080b12e748a7d1d Mon Sep 17 00:00:00 2001 From: nuoun <10226424+nuoun@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:13:49 +0100 Subject: [PATCH] Rollback amalg option for MSVC builds --- libs/luajitlib/README.md | 2 +- libs/luajitlib/build-msvc-luajit.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/luajitlib/README.md b/libs/luajitlib/README.md index 8972c95b202..015580fcf36 100644 --- a/libs/luajitlib/README.md +++ b/libs/luajitlib/README.md @@ -24,7 +24,7 @@ On Unix-like platforms (including macOS), the default is to use the `amalg` buil ### Windows + MSVC -luajitlib uses a custom version of the `msvcbuild.bat` script included with LuaJIT to build amalgamated, with static linking using the compiler flag `/MT` instead of `/MD` and without the `/Zi` option to omit debug information. See [here](https://learn.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-170&viewFallbackFrom=vs-2019) and [here](https://learn.microsoft.com/en-us/cpp/build/reference/z7-zi-zi-debug-information-format?view=msvc-170) for more information. +luajitlib uses a custom version of the `msvcbuild.bat` script included with LuaJIT to build with static linking using the compiler flag `/MT` instead of `/MD` and without the `/Zi` option to omit debug information. See [here](https://learn.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-170&viewFallbackFrom=vs-2019) and [here](https://learn.microsoft.com/en-us/cpp/build/reference/z7-zi-zi-debug-information-format?view=msvc-170) for more information. ### MinGW diff --git a/libs/luajitlib/build-msvc-luajit.bat b/libs/luajitlib/build-msvc-luajit.bat index 5d1ffcec27a..e90c32f7aba 100644 --- a/libs/luajitlib/build-msvc-luajit.bat +++ b/libs/luajitlib/build-msvc-luajit.bat @@ -22,7 +22,7 @@ xcopy /e /i /h LuaJIT "%SD%\LuaJIT" copy /y msvcbuild.bat "%SD%\LuaJIT\src\" cd "%SD%\LuaJIT\src" -call msvcbuild.bat static amalg +call msvcbuild.bat static copy lua51.lib "%OD%" echo "%OD%"