Skip to content

Commit 21e3c58

Browse files
committed
Fix MiniZip-NG breaking Win7 compatibility (followup to e489f1f)
Override Windows version check via preprocessor definition to not build with UWP garbage Rebuild MiniZip-NG binaries
1 parent 6319aa9 commit 21e3c58

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
Binary file not shown.
Binary file not shown.

external/sources/minizip-ng-4.0.0/minizip.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8585
<UseFullPaths>false</UseFullPaths>
8686
<WarningLevel>Level3</WarningLevel>
87-
<PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
87+
<PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32_WINNT=_WIN32_WINNT_WIN7;WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
8888
<ObjectFileName>$(IntDir)</ObjectFileName>
8989
<MultiProcessorCompilation>true</MultiProcessorCompilation>
9090
</ClCompile>
@@ -106,7 +106,7 @@
106106
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
107107
<UseFullPaths>false</UseFullPaths>
108108
<WarningLevel>Level3</WarningLevel>
109-
<PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
109+
<PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32_WINNT=_WIN32_WINNT_WIN7;WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
110110
<ObjectFileName>$(IntDir)</ObjectFileName>
111111
<MultiProcessorCompilation>true</MultiProcessorCompilation>
112112
</ClCompile>
@@ -126,7 +126,7 @@
126126
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
127127
<UseFullPaths>false</UseFullPaths>
128128
<WarningLevel>Level3</WarningLevel>
129-
<PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;NDEBUG;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
129+
<PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32_WINNT=_WIN32_WINNT_WIN7;WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;NDEBUG;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
130130
<ObjectFileName>$(IntDir)</ObjectFileName>
131131
<DebugInformationFormat>
132132
</DebugInformationFormat>
@@ -148,7 +148,7 @@
148148
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
149149
<UseFullPaths>false</UseFullPaths>
150150
<WarningLevel>Level3</WarningLevel>
151-
<PreprocessorDefinitions>%(PreprocessorDefinitions);WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;NDEBUG;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
151+
<PreprocessorDefinitions>%(PreprocessorDefinitions);_WIN32_WINNT=_WIN32_WINNT_WIN7;WIN32;_WINDOWS;MZ_COMPAT;ZLIB_COMPAT;NDEBUG;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;HAVE_ZLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION</PreprocessorDefinitions>
152152
<ObjectFileName>$(IntDir)</ObjectFileName>
153153
<DebugInformationFormat>
154154
</DebugInformationFormat>

0 commit comments

Comments
 (0)