ee1b2f53cc
Currently on Windows some dependencies are built with MinGW/GCC 3.x this commit removes that, in favor of building them with MSVC via msys2. This will make it easier in the future to offer Win/Arm64 builds of blender. Notable changes: - This change drops support for the external libxvid library in favor of ffmpegs built in support for this format. This has been done with permission from the VFX module. Pull Request: https://projects.blender.org/blender/blender/pulls/108983 https://projects.blender.org/blender/blender/pulls/105502
14 lines
404 B
Diff
14 lines
404 B
Diff
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
|
|
index 247ba24..e5c16e6 100644
|
|
--- a/zconf.h.cmakein
|
|
+++ b/zconf.h.cmakein
|
|
@@ -439,7 +439,7 @@ typedef uLong FAR uLongf;
|
|
typedef unsigned long z_crc_t;
|
|
#endif
|
|
|
|
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
|
+#if defined(HAVE_UNISTD_H) && HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
|
# define Z_HAVE_UNISTD_H
|
|
#endif
|
|
|