Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Windows: fix build issue of zip library with Visual Studio 2015/2017

Browse Source
This commit is contained in:
Mounir IDRASSI
2018-03-04 18:35:07 +01:00
parent 1c78303d94
commit 21ef234989
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Common/Zip.vcxproj
View File

@@ -35,7 +35,6 @@
<ClCompile Include="libzip\zip_error_get.c" /> <ClCompile Include="libzip\zip_error_get.c" />
<ClCompile Include="libzip\zip_error_get_sys_type.c" /> <ClCompile Include="libzip\zip_error_get_sys_type.c" />
<ClCompile Include="libzip\zip_error_strerror.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_err_str.c" />
<ClCompile Include="libzip\zip_extra_field.c" /> <ClCompile Include="libzip\zip_extra_field.c" />
<ClCompile Include="libzip\zip_extra_field_api.c" /> <ClCompile Include="libzip\zip_extra_field_api.c" />
@@ -223,7 +222,7 @@
<Optimization>Disabled</Optimization> <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> <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> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>zlib:libzip</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

3
src/Common/Zip.vcxproj.filters
View File

@@ -57,9 +57,6 @@
<ClCompile Include="libzip\zip_error_strerror.c"> <ClCompile Include="libzip\zip_error_strerror.c">
<Filter>libzip</Filter> <Filter>libzip</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="libzip\zip_error_to_str.c">
<Filter>libzip</Filter>
</ClCompile>
<ClCompile Include="libzip\zip_err_str.c"> <ClCompile Include="libzip\zip_err_str.c">
<Filter>libzip</Filter> <Filter>libzip</Filter>
</ClCompile> </ClCompile>

2
src/Common/libzip/config.h
View File

@@ -11,7 +11,7 @@
#define HAVE__FILENO #define HAVE__FILENO
#define HAVE__OPEN #define HAVE__OPEN
#define HAVE__SETMODE #define HAVE__SETMODE
#define HAVE__SNPRINTF /* #undef HAVE__SNPRINTF */
#define HAVE__STRDUP #define HAVE__STRDUP
#define HAVE__STRICMP #define HAVE__STRICMP
#define HAVE__STRTOI64 #define HAVE__STRTOI64