Forráskód Böngészése

Updated LuaJIT build command from AuahDark: pass in debug for debug builds, and amalg for release builds.

Alex Szpakowski 6 éve
szülő
commit
915d5a1fb9
1 módosított fájl, 3 hozzáadás és 2 törlés
  1. 3 2
      CMakeLists.txt

+ 3 - 2
CMakeLists.txt

@@ -265,7 +265,8 @@ if(MSVC)
 		@echo off
 		call \"${MEGA_MSVC_VCVARSALL_BAT}\" ${MEGA_MSVC_VCVARSALL_BAT_ARG}
 		cd \"${MEGA_LUAJIT_SOURCE_DIR}/src\"
-		msvcbuild.bat
+		if %1 == \"\" shift /1
+		msvcbuild.bat %1 %2
 	")
 
 	file(WRITE ${MEGA_LUAJIT_SOURCE_DIR}/megabuild.bat ${MEGA_LUAJIT_BUILD_BAT})
@@ -274,7 +275,7 @@ if(MSVC)
 		SOURCE_DIR ${MEGA_LUAJIT_SOURCE_DIR}
 		BUILD_IN_SOURCE 1
 		CONFIGURE_COMMAND ""
-		BUILD_COMMAND "${MEGA_LUAJIT_SOURCE_DIR}/megabuild.bat"
+		BUILD_COMMAND "${MEGA_LUAJIT_SOURCE_DIR}/megabuild.bat" $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:debug> $<$<NOT:$<CONFIG:Debug>>:amalg>
 		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)