From 7ac1abcad169708a8973c6ef03eefa64e0ef24bc Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 5 Sep 2021 16:37:38 +0200 Subject: Windows: Fix warning and link error in SetupDLL project --- src/SetupDLL/Setup.c | 1 - src/SetupDLL/SetupDLL.vcxproj | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SetupDLL/Setup.c b/src/SetupDLL/Setup.c index 15725554..4aec04f9 100644 --- a/src/SetupDLL/Setup.c +++ b/src/SetupDLL/Setup.c @@ -3497,7 +3497,6 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_DoChecks(MSIHANDLE hInstaller) DWORD cchValueBuf = 0; UINT uiStat = 0; HKEY hkey = 0; - DWORD dw = 0; std::wstring szInstallDir = L""; BOOL bRefreshExts = FALSE; BOOL bDisableReboot = FALSE; diff --git a/src/SetupDLL/SetupDLL.vcxproj b/src/SetupDLL/SetupDLL.vcxproj index 374ad866..6b68dcc4 100644 --- a/src/SetupDLL/SetupDLL.vcxproj +++ b/src/SetupDLL/SetupDLL.vcxproj @@ -88,7 +88,7 @@ /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) - msi.lib;libcmtd.lib;atlsd.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;%(AdditionalDependencies) + version.lib;msi.lib;libcmtd.lib;atlsd.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;%(AdditionalDependencies) $(OutDir)VeraCryptSetup.dll RequireAdministrator user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs) @@ -127,7 +127,7 @@ copy Debug\VeraCryptSetup.dll "..\Debug\Setup Files\VeraCryptSetup.dll" >NUL: /IGNORE:4089 %(AdditionalOptions) - msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;%(AdditionalDependencies) + version.lib;msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;%(AdditionalDependencies) $(OutDir)VeraCryptSetup.dll RequireAdministrator user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs) @@ -166,7 +166,7 @@ copy Debug\VeraCryptSetup.dll "..\Debug\Setup Files\VeraCryptSetup.dll" >NUL: /IGNORE:4089 %(AdditionalOptions) - msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;%(AdditionalDependencies) + version.lib;msi.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;%(AdditionalDependencies) $(OutDir)VeraCryptSetup.exe RequireAdministrator user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs) -- cgit v1.2.3