From 6d1ad12755031b4ba4eff362d4df44fc3d76d62a Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 15 Nov 2024 15:50:32 +0100 Subject: Windows: move main project files and solution from VS 2010 to VS 2022. Delete unused files. --- src/Setup/Portable.vcxproj | 53 ++--- src/Setup/Setup.vcproj | 484 --------------------------------------------- src/Setup/Setup.vcxproj | 53 ++--- 3 files changed, 36 insertions(+), 554 deletions(-) delete mode 100644 src/Setup/Setup.vcproj (limited to 'src/Setup') diff --git a/src/Setup/Portable.vcxproj b/src/Setup/Portable.vcxproj index 1c758b2b..2f429d30 100644 --- a/src/Setup/Portable.vcxproj +++ b/src/Setup/Portable.vcxproj @@ -22,27 +22,29 @@ {60698D56-DB83-4D19-9C87-9DFB6A6F8C87} Portable Win32Proj + Portable + 10.0 Application Unicode - Windows7.1SDK + v143 Application Unicode - Windows7.1SDK + v143 Application Unicode - Windows7.1SDK + v143 Application Unicode - Windows7.1SDK + v143 @@ -66,17 +68,17 @@ <_ProjectFileVersion>10.0.40219.1 - PortableDebug\ - PortableDebug\ + $(ProjectDir)PortableDebug\ + $(ProjectDir)PortableDebug\Int\ true true true - PortableRelease\ - PortableRelease\ - PortableRelease\ - PortableRelease\ - PortableRelease\ - PortableRelease\ + $(ProjectDir)PortableRelease\ + $(ProjectDir)PortableRelease\ + $(ProjectDir)PortableRelease\ + $(ProjectDir)PortableRelease\Int\ + $(ProjectDir)PortableRelease\ + $(ProjectDir)PortableRelease\Int\ false false false @@ -105,7 +107,7 @@ /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) - libcmtd.lib;atlsd.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;..\Common\Debug\lzma.lib;%(AdditionalDependencies) + libcmtd.lib;atls.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;..\Common\Debug\lzma.lib;%(AdditionalDependencies) $(OutDir)VeraCryptPortable.exe AsInvoker mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs) @@ -115,6 +117,7 @@ false true MachineX86 + true Portable.manifest;%(AdditionalManifestFiles) @@ -140,10 +143,11 @@ copy PortableDebug\VeraCryptPortable.exe "..\Debug\Setup Files\VeraCrypt Portabl Level4 ProgramDatabase 4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings) + Guard /IGNORE:4089 %(AdditionalOptions) - mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies) + atls.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies) $(OutDir)VeraCryptPortable.exe AsInvoker mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs) @@ -318,27 +322,6 @@ copy PortableDebug\VeraCryptPortable.exe "..\Debug\Setup Files\VeraCrypt Portabl - - - {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} - false - - - {b896fe1f-6bf3-4f75-9148-f841829073d9} - - - {9715ff1d-599b-4bbc-ad96-bef6e08ff827} - false - - - {9dc1abe2-d18b-48fb-81d2-8c50adc57bcf} - false - - - {e4c40f94-e7f9-4981-86e4-186b46f993f3} - false - - diff --git a/src/Setup/Setup.vcproj b/src/Setup/Setup.vcproj deleted file mode 100644 index a1a6a81f..00000000 --- a/src/Setup/Setup.vcproj +++ /dev/null @@ -1,484 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj index d1159c0b..0146be08 100644 --- a/src/Setup/Setup.vcxproj +++ b/src/Setup/Setup.vcxproj @@ -22,27 +22,29 @@ {DF5F654D-BD44-4E31-B92E-B68074DC37A8} Setup Win32Proj + Setup + 10.0 Application Unicode - Windows7.1SDK + v143 Application Unicode - Windows7.1SDK + v143 Application Unicode - Windows7.1SDK + v143 Application Unicode - Windows7.1SDK + v143 @@ -66,17 +68,17 @@ <_ProjectFileVersion>10.0.40219.1 - Debug\ - Debug\ + $(ProjectDir)Debug\ + $(ProjectDir)Debug\Int\ true true true - Release\ - Release\ - Release\ - Release\ - Release\ - Release\ + $(ProjectDir)Release\ + $(ProjectDir)Release\ + $(ProjectDir)Release\ + $(ProjectDir)Release\Int\ + $(ProjectDir)Release\ + $(ProjectDir)Release\Int\ false false false @@ -105,7 +107,7 @@ /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) - libcmtd.lib;atlsd.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;..\Common\Debug\lzma.lib;%(AdditionalDependencies) + libcmtd.lib;atls.lib;mpr.lib;..\Common\Debug\Zip.lib;..\Crypto\Debug\crypto.lib;..\Common\Debug\lzma.lib;%(AdditionalDependencies) $(OutDir)VeraCryptSetup.exe RequireAdministrator mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs) @@ -115,6 +117,7 @@ false true MachineX86 + true Setup.manifest;%(AdditionalManifestFiles) @@ -141,10 +144,11 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL Level4 ProgramDatabase 4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings) + Guard /IGNORE:4089 %(AdditionalOptions) - mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies) + atls.lib;mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;..\Common\Release\lzma.lib;%(AdditionalDependencies) $(OutDir)VeraCryptSetup.exe RequireAdministrator mpr.dll;bcrypt.dll;user32.dll;gdi32.dll;comdlg32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;shlwapi.dll;setupapi.dll;wintrust.dll;comctl32.dll;%(DelayLoadDLLs) @@ -321,27 +325,6 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL true - - - {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} - false - - - {b896fe1f-6bf3-4f75-9148-f841829073d9} - - - {9715ff1d-599b-4bbc-ad96-bef6e08ff827} - false - - - {9dc1abe2-d18b-48fb-81d2-8c50adc57bcf} - false - - - {e4c40f94-e7f9-4981-86e4-186b46f993f3} - false - - -- cgit v1.2.3