From 9b4e087882e167d6816c468743fef50a050a1ca4 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Mon, 5 Jun 2017 16:23:24 +0200
Subject: Windows: create dedicated project for zip library and link other
 binaries against it instead of recompiling zlib and libzip for each project
 separately.

---
 src/Format/Format.vcxproj         | 166 +---------------
 src/Format/Format.vcxproj.filters | 390 --------------------------------------
 2 files changed, 4 insertions(+), 552 deletions(-)

(limited to 'src/Format')

diff --git a/src/Format/Format.vcxproj b/src/Format/Format.vcxproj
index a13d7fa6..f069ef11 100644
--- a/src/Format/Format.vcxproj
+++ b/src/Format/Format.vcxproj
@@ -106,7 +106,7 @@
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -146,7 +146,7 @@ copy Debug\VeraCryptFormat.exe "..\Debug\Setup Files\VeraCrypt Format.exe" &gt;N
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;..\Common\x64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -186,7 +186,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -228,7 +228,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -249,148 +249,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c" />
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c" />
-    <ClCompile Include="..\Common\libzip\zip_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_err_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c" />
-    <ClCompile Include="..\Common\libzip\zip_fclose.c" />
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fread.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c" />
-    <ClCompile Include="..\Common\libzip\zip_hash.c" />
-    <ClCompile Include="..\Common\libzip\zip_io_util.c" />
-    <ClCompile Include="..\Common\libzip\zip_memdup.c" />
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c" />
-    <ClCompile Include="..\Common\libzip\zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_call.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_function.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_read.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_window.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c" />
-    <ClCompile Include="..\Common\libzip\zip_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_string.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c" />
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c" />
-    <ClCompile Include="..\Common\zlib\adler32.c" />
-    <ClCompile Include="..\Common\zlib\crc32.c" />
-    <ClCompile Include="..\Common\zlib\deflate.c" />
-    <ClCompile Include="..\Common\zlib\inffast.c" />
-    <ClCompile Include="..\Common\zlib\inflate.c" />
-    <ClCompile Include="..\Common\zlib\inftrees.c" />
-    <ClCompile Include="..\Common\zlib\trees.c" />
-    <ClCompile Include="..\Common\zlib\zutil.c" />
     <ClCompile Include="FormatCom.cpp" />
     <ClCompile Include="InPlace.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
@@ -461,22 +319,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
     <ClInclude Include="..\Common\Exception.h" />
     <ClInclude Include="..\Common\Fat.h" />
     <ClInclude Include="..\Common\Format.h" />
-    <ClInclude Include="..\Common\libzip\compat.h" />
-    <ClInclude Include="..\Common\libzip\config.h" />
-    <ClInclude Include="..\Common\libzip\zconf.h" />
-    <ClInclude Include="..\Common\libzip\zip.h" />
-    <ClInclude Include="..\Common\libzip\zipint.h" />
-    <ClInclude Include="..\Common\libzip\zipwin32.h" />
-    <ClInclude Include="..\Common\zlib\crc32.h" />
-    <ClInclude Include="..\Common\zlib\deflate.h" />
-    <ClInclude Include="..\Common\zlib\inffast.h" />
-    <ClInclude Include="..\Common\zlib\inffixed.h" />
-    <ClInclude Include="..\Common\zlib\inflate.h" />
-    <ClInclude Include="..\Common\zlib\inftrees.h" />
-    <ClInclude Include="..\Common\zlib\trees.h" />
-    <ClInclude Include="..\Common\zlib\zconf.h" />
-    <ClInclude Include="..\Common\zlib\zlib.h" />
-    <ClInclude Include="..\Common\zlib\zutil.h" />
     <ClInclude Include="FormatCom.h" />
     <ClInclude Include="..\Common\GfMul.h" />
     <ClInclude Include="InPlace.h" />
diff --git a/src/Format/Format.vcxproj.filters b/src/Format/Format.vcxproj.filters
index e250fefe..4f0e81eb 100644
--- a/src/Format/Format.vcxproj.filters
+++ b/src/Format/Format.vcxproj.filters
@@ -19,12 +19,6 @@
     <Filter Include="Resource Files\Common">
       <UniqueIdentifier>{881fda51-0ca5-4603-9de7-c618932554b4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Common\libzip">
-      <UniqueIdentifier>{89e6575e-aa9c-47e4-8280-47d282b11228}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common\zlib">
-      <UniqueIdentifier>{1ebcc85d-1ce3-488c-89e5-f8605df170e2}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FormatCom.cpp">
@@ -114,342 +108,6 @@
     <ClCompile Include="..\Common\Xts.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_err_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fclose.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fread.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_hash.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_io_util.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_memdup.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_call.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_function.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_read.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_window.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_string.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\adler32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\crc32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\deflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inffast.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inftrees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\trees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\zutil.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="FormatCom.idl">
@@ -550,54 +208,6 @@
     <ClInclude Include="..\Common\Xts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\libzip\compat.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\config.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zconf.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zip.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipint.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipwin32.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\crc32.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\deflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffast.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffixed.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inftrees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\trees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zconf.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zlib.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zutil.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Boot\Windows\Release_Serpent_SHA2\BootSector.bin">
-- 
cgit v1.2.3