Compare commits

..

No commits in common. "master" and "Release_421" have entirely different histories.

3 changed files with 9 additions and 19 deletions

View File

@ -1,6 +1,6 @@
LameXP - Audio Encoder Front-End LameXP - Audio Encoder Front-End
Copyright (C) 2004-2024 LoRd_MuldeR <MuldeR2@GMX.de> Copyright (C) 2004-2023 LoRd_MuldeR <MuldeR2@GMX.de>
https://www.muldersoft.com/ http://www.muldersoft.com/
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU GENERAL PUBLIC LICENSE as published by it under the terms of the GNU GENERAL PUBLIC LICENSE as published by

View File

@ -111,14 +111,6 @@ if %PATH_VCTOOL% GEQ 142 (
set "PATH_REDIST_VC=%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp" 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" "%BIN_PATH%\LameXP.exe" "%TMP_PATH%"
call "%~dp0\_copy.bat" "%~dp0\..\..\etc\Manifest\VisualElements.xml" "%TMP_PATH%\LameXP.VisualElementsManifest.xml" call "%~dp0\_copy.bat" "%~dp0\..\..\etc\Manifest\VisualElements.xml" "%TMP_PATH%\LameXP.VisualElementsManifest.xml"
@ -127,10 +119,10 @@ if "%LAMEXP_REDIST%"=="1" (
call "%~dp0\_copy.bat" "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%" call "%~dp0\_copy.bat" "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%"
mkdir "%TMP_PATH%\imageformats" mkdir "%TMP_PATH%\imageformats"
for %%i in (Core,Gui,Network,Xml,Svg) do ( for %%i in (Core,Gui,Network,Xml,Svg) do (
call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\%QT_REDIST_CONFIG%\bin\Qt%%i%QT_REDIST_SUFFIX%4.dll" "%TMP_PATH%" call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\Shared\bin\Qt%%i4.dll" "%TMP_PATH%"
) )
for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do ( for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do (
call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\%QT_REDIST_CONFIG%\plugins\imageformats\q%%i%QT_REDIST_SUFFIX%4.dll" "%TMP_PATH%\imageformats" call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats"
) )
for %%i in ("%PATH_REDIST_VC%\x86\*.dll") do call "%~dp0\_copy.bat" "%%~i" "%TMP_PATH%" for %%i in ("%PATH_REDIST_VC%\x86\*.dll") do call "%~dp0\_copy.bat" "%%~i" "%TMP_PATH%"
if %PATH_VCTOOL% GEQ 140 ( if %PATH_VCTOOL% GEQ 140 (
@ -146,12 +138,10 @@ for %%x in (exe,dll) do (
) )
) )
if not "%LAMEXP_CONFIG%"=="Debug" ( for %%e in (LameXP,Qt,MUtils) do (
for %%e in (LameXP,Qt,MUtils) do ( for %%x in (exe,dll) do (
for %%x in (exe,dll) do ( for %%f in ("%TMP_PATH%\%%e*.%%x") do (
for %%f in ("%TMP_PATH%\%%e*.%%x") do ( "%~dp0\..\..\..\Prerequisites\UPX\upx.exe" --best "%%~ff"
"%~dp0\..\..\..\Prerequisites\UPX\upx.exe" --best "%%~ff"
)
) )
) )
) )

View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 1 #define VER_LAMEXP_MINOR_LO 1
#define VER_LAMEXP_TYPE Final #define VER_LAMEXP_TYPE Final
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 2384 #define VER_LAMEXP_BUILD 2382
#define VER_LAMEXP_CONFG 2188 #define VER_LAMEXP_CONFG 2188
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////