VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2018-03-04 17:35:07 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2018-03-04 17:50:19 (GMT)
commit21ef23498946d9e39323919183e4f105baf5e993 (patch)
tree8039bcd1a1fed88580702c1db24d8e056ffe1fdf /src/Common
parent1c78303d94275001f08de06c216f0d87809f79a7 (diff)
downloadVeraCrypt-21ef23498946d9e39323919183e4f105baf5e993.zip
VeraCrypt-21ef23498946d9e39323919183e4f105baf5e993.tar.gz
Windows: fix build issue of zip library with Visual Studio 2015/2017
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/Zip.vcxproj3
-rw-r--r--src/Common/Zip.vcxproj.filters3
-rw-r--r--src/Common/libzip/config.h2
3 files changed, 2 insertions, 6 deletions
diff --git a/src/Common/Zip.vcxproj b/src/Common/Zip.vcxproj
index 3ed4358..1560483 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 8cc8b9b..651be91 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 6212383..8c6c46a 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