From b6c0d579e377ef2135739446b67b5ae99e799542 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Thu, 20 Jun 2019 17:13:26 +0200 Subject: [PATCH] Improved VS2019 support. --- LameXP_VS2019.vcxproj | 4 ++-- etc/Deployment/make.bat | 14 +++++++++++--- src/Config.h | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/LameXP_VS2019.vcxproj b/LameXP_VS2019.vcxproj index 75bbc6ad..356b3350 100644 --- a/LameXP_VS2019.vcxproj +++ b/LameXP_VS2019.vcxproj @@ -239,9 +239,9 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) - notelemetry.obj;QtCore.lib;QtGui.lib;QtXml.lib;QtSvg.lib;qsvg.lib;qico.lib;qtga.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Sensapi.lib;PowrProf.lib;psapi.lib;Version.lib;EncodePointer.lib;%(AdditionalDependencies) + notelemetry.obj;QtCore.lib;QtGui.lib;QtXml.lib;QtSvg.lib;qsvg.lib;qico.lib;qtga.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Sensapi.lib;PowrProf.lib;psapi.lib;Version.lib;%(AdditionalDependencies) LinkVerboseLib - $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Static\lib;$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Static\plugins\imageformats;$(SolutionDir)\..\Prerequisites\EncodePointer\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Static\lib;$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Static\plugins\imageformats;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat index 582cc5b8..ad75d94f 100644 --- a/etc/Deployment/make.bat +++ b/etc/Deployment/make.bat @@ -103,6 +103,14 @@ for %%i in (exe,sfx,zip,txt) do ( rd /S /Q "%TMP_PATH%" 2> NUL mkdir "%TMP_PATH%" +if %PATH_VCTOOL% GEQ 142 ( + set "PATH_REDIST_QT=%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%" + set "PATH_REDIST_VC=%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%" +) else ( + set "PATH_REDIST_QT=%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp" + set "PATH_REDIST_VC=%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp" +) + call "%~dp0\_copy.bat" "%BIN_PATH%\LameXP.exe" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\etc\Manifest\VisualElements.xml" "%TMP_PATH%\LameXP.VisualElementsManifest.xml" @@ -111,12 +119,12 @@ 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" "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\bin\Qt%%i4.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 ( - call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats" + call "%~dp0\_copy.bat" "%PATH_REDIST_QT%\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats" ) - call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp\x86\*.dll" "%TMP_PATH%" + call "%~dp0\_copy.bat" "%PATH_REDIST_VC%\x86\*.dll" "%TMP_PATH%" if %PATH_VCTOOL% GEQ 140 ( call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%TMP_PATH%" ) diff --git a/src/Config.h b/src/Config.h index 18d8cd4f..2efcaa50 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 8 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 3 -#define VER_LAMEXP_BUILD 2221 +#define VER_LAMEXP_BUILD 2222 #define VER_LAMEXP_CONFG 2188 ///////////////////////////////////////////////////////////////////////////////