From 328eab05891c567a7f477ea16dec13225d21b735 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 25 Aug 2024 21:13:19 +0200 Subject: [PATCH] Support for packaging "Debug" build. --- etc/Deployment/make.bat | 22 ++++++++++++++++------ src/Config.h | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat index fd0be175..394b226f 100644 --- a/etc/Deployment/make.bat +++ b/etc/Deployment/make.bat @@ -111,6 +111,14 @@ if %PATH_VCTOOL% GEQ 142 ( set "PATH_REDIST_VC=%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp" ) +if "%LAMEXP_CONFIG%"=="Debug" ( + set "QT_REDIST_CONFIG=Debug" + set "QT_REDIST_SUFFIX=d" +) else ( + set "QT_REDIST_CONFIG=Shared" + set "QT_REDIST_SUFFIX=" +) + call "%~dp0\_copy.bat" "%BIN_PATH%\LameXP.exe" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\etc\Manifest\VisualElements.xml" "%TMP_PATH%\LameXP.VisualElementsManifest.xml" @@ -119,10 +127,10 @@ if "%LAMEXP_REDIST%"=="1" ( call "%~dp0\_copy.bat" "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%" mkdir "%TMP_PATH%\imageformats" for %%i in (Core,Gui,Network,Xml,Svg) do ( - call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\Shared\bin\Qt%%i4.dll" "%TMP_PATH%" + call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\%QT_REDIST_CONFIG%\bin\Qt%%i%QT_REDIST_SUFFIX%4.dll" "%TMP_PATH%" ) for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do ( - call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats" + call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\%QT_REDIST_CONFIG%\plugins\imageformats\q%%i%QT_REDIST_SUFFIX%4.dll" "%TMP_PATH%\imageformats" ) for %%i in ("%PATH_REDIST_VC%\x86\*.dll") do call "%~dp0\_copy.bat" "%%~i" "%TMP_PATH%" if %PATH_VCTOOL% GEQ 140 ( @@ -138,10 +146,12 @@ for %%x in (exe,dll) do ( ) ) -for %%e in (LameXP,Qt,MUtils) do ( - for %%x in (exe,dll) do ( - for %%f in ("%TMP_PATH%\%%e*.%%x") do ( - "%~dp0\..\..\..\Prerequisites\UPX\upx.exe" --best "%%~ff" +if not "%LAMEXP_CONFIG%"=="Debug" ( + for %%e in (LameXP,Qt,MUtils) do ( + for %%x in (exe,dll) do ( + for %%f in ("%TMP_PATH%\%%e*.%%x") do ( + "%~dp0\..\..\..\Prerequisites\UPX\upx.exe" --best "%%~ff" + ) ) ) ) diff --git a/src/Config.h b/src/Config.h index 8b2c826f..dc440db7 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_TYPE Final #define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 2382 +#define VER_LAMEXP_BUILD 2384 #define VER_LAMEXP_CONFG 2188 ///////////////////////////////////////////////////////////////////////////////