diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2018-03-04 18:35:07 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2018-03-04 18:50:19 +0100 |
| commit | 21ef23498946d9e39323919183e4f105baf5e993 (patch) | |
| tree | 8039bcd1a1fed88580702c1db24d8e056ffe1fdf | |
| parent | 1c78303d94275001f08de06c216f0d87809f79a7 (diff) | |
| download | VeraCrypt-21ef23498946d9e39323919183e4f105baf5e993.tar.gz VeraCrypt-21ef23498946d9e39323919183e4f105baf5e993.zip | |
Windows: fix build issue of zip library with Visual Studio 2015/2017
| -rw-r--r-- | src/Common/Zip.vcxproj | 3 | ||||
| -rw-r--r-- | src/Common/Zip.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/Common/libzip/config.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/Common/Zip.vcxproj b/src/Common/Zip.vcxproj index 3ed43587..15604833 100644 --- a/src/Common/Zip.vcxproj +++ b/src/Common/Zip.vcxproj @@ -35,7 +35,6 @@ <ClCompile Include="libzip\zip_error_get.c" /> <ClCompile Include="libzip\zip_error_get_sys_type.c" /> <ClCompile Include="libzip\zip_error_strerror.c" /> - <ClCompile Include="libzip\zip_error_to_str.c" /> <ClCompile Include="libzip\zip_err_str.c" /> <ClCompile Include="libzip\zip_extra_field.c" /> <ClCompile Include="libzip\zip_extra_field_api.c" /> @@ -223,7 +222,7 @@ <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <AdditionalIncludeDirectories>zlib:libzip</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/src/Common/Zip.vcxproj.filters b/src/Common/Zip.vcxproj.filters index 8cc8b9bd..651be91e 100644 --- a/src/Common/Zip.vcxproj.filters +++ b/src/Common/Zip.vcxproj.filters @@ -57,9 +57,6 @@ <ClCompile Include="libzip\zip_error_strerror.c"> <Filter>libzip</Filter> </ClCompile> - <ClCompile Include="libzip\zip_error_to_str.c"> - <Filter>libzip</Filter> - </ClCompile> <ClCompile Include="libzip\zip_err_str.c"> <Filter>libzip</Filter> </ClCompile> diff --git a/src/Common/libzip/config.h b/src/Common/libzip/config.h index 6212383c..8c6c46a0 100644 --- a/src/Common/libzip/config.h +++ b/src/Common/libzip/config.h @@ -11,7 +11,7 @@ #define HAVE__FILENO #define HAVE__OPEN #define HAVE__SETMODE -#define HAVE__SNPRINTF +/* #undef HAVE__SNPRINTF */ #define HAVE__STRDUP #define HAVE__STRICMP #define HAVE__STRTOI64 |