diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-09-15 10:04:05 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-10-17 18:40:06 +0200 |
| commit | 4dacedd9ccdbdc6a6e62d9fb86e9b2ea903a3629 (patch) | |
| tree | 567350f56dd4ee4dd291d13199610d38dac51879 /src/Setup/Setup.vcxproj | |
| parent | 66891638d51351fae5cd82a88c1a64661a025de0 (diff) | |
| download | VeraCrypt-4dacedd9ccdbdc6a6e62d9fb86e9b2ea903a3629.tar.gz VeraCrypt-4dacedd9ccdbdc6a6e62d9fb86e9b2ea903a3629.zip | |
Windows: Replace XZip/XUnzip library with zlib and libzip and include the sources of these library into VeraCrypt source tree.
Diffstat (limited to 'src/Setup/Setup.vcxproj')
| -rw-r--r-- | src/Setup/Setup.vcxproj | 145 |
1 files changed, 136 insertions, 9 deletions
diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj index c319dc1f..af2221aa 100644 --- a/src/Setup/Setup.vcxproj +++ b/src/Setup/Setup.vcxproj @@ -55,8 +55,8 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SETUP;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>SETUP;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -65,7 +65,7 @@ </PrecompiledHeader> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions> @@ -93,8 +93,8 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL <ClCompile> <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions> <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>SETUP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>SETUP;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>true</BufferSecurityCheck> <PrecompiledHeader> @@ -104,7 +104,7 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL <WarningLevel>Level4</WarningLevel> <DebugInformationFormat> </DebugInformationFormat> - <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <AdditionalOptions>/IGNORE:4089 %(AdditionalOptions)</AdditionalOptions> @@ -129,8 +129,120 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL </PostBuildEvent> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\Common\XUnzip.cpp" /> - <ClCompile Include="..\Common\XZip.cpp" /> + <ClCompile Include="..\Common\libzip\mkstemp.c" /> + <ClCompile Include="..\Common\libzip\zip_add.c" /> + <ClCompile Include="..\Common\libzip\zip_add_dir.c" /> + <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" /> + <ClCompile Include="..\Common\libzip\zip_dirent.c" /> + <ClCompile Include="..\Common\libzip\zip_dir_add.c" /> + <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" /> + <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" /> + <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\compress.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\uncompr.c" /> + <ClCompile Include="..\Common\zlib\zutil.c" /> <ClCompile Include="ComSetup.cpp" /> <ClCompile Include="Dir.c" /> <ClCompile Include="SelfExtract.c" /> @@ -154,7 +266,6 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs> </ClCompile> <ClCompile Include="..\Common\Endian.c" /> - <ClCompile Include="..\Common\Inflate.c" /> <ClCompile Include="..\Common\Language.c" /> <ClCompile Include="..\Common\Registry.c" /> </ItemGroup> @@ -174,8 +285,24 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL <ItemGroup> <ClInclude Include="..\Common\Apidrvr.h" /> <ClInclude Include="..\Common\Combo.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\XUnzip.h" /> <ClInclude Include="..\Common\XZip.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="ComSetup.h" /> <ClInclude Include="..\Common\Crc.h" /> <ClInclude Include="Dir.h" /> |