From 2ccf2ae9a4b3bd2a3f9383137f4275e16e30f754 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Sat, 14 Jan 2023 15:11:43 +0800 Subject: [PATCH] Revert "Updated LuaJIT build command from AuahDark: pass in debug for debug builds, and amalg for release builds." This reverts commit 915d5a1fb9d20729e5cd2f540e897e343a1b6d10. --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd72a95..5a75bca8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,8 +316,7 @@ if(MSVC AND NOT MEGA_ARM64) call \"${MEGA_MSVC_VCVARSALL_BAT}\" ${MEGA_MSVC_VCVARSALL_BAT_ARG} ) cd \"${MEGA_LUAJIT_SOURCE_DIR}/src\" - if %1 == \"\" shift /1 - msvcbuild.bat %1 %2 + msvcbuild.bat ") file(WRITE ${MEGA_LUAJIT_SOURCE_DIR}/megabuild.bat ${MEGA_LUAJIT_BUILD_BAT}) @@ -326,7 +325,7 @@ if(MSVC AND NOT MEGA_ARM64) SOURCE_DIR ${MEGA_LUAJIT_SOURCE_DIR} BUILD_IN_SOURCE 1 CONFIGURE_COMMAND "" - BUILD_COMMAND "${MEGA_LUAJIT_SOURCE_DIR}/megabuild.bat" $<$,$>:debug> $<$>:amalg> + BUILD_COMMAND "${MEGA_LUAJIT_SOURCE_DIR}/megabuild.bat" INSTALL_COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/bin COMMAND cmake -E copy ${MEGA_LUAJIT_SOURCE_DIR}/src/lua51.dll ${CMAKE_BINARY_DIR}/bin COMMAND cmake -E copy ${MEGA_LUAJIT_SOURCE_DIR}/src/lua51.lib ${CMAKE_BINARY_DIR}/bin)