diff options
| author | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-06-05 14:09:31 +0300 |
| commit | 920a58d9b6d667894cf166cbbd25e4c2fbd238ea (patch) | |
| tree | 7ca5a9da640753b5e070c439ac3bdd14dfad92cf /build_files/build_environment/patches/pthreads.diff | |
| parent | c94b6209861ca7cc3985b53474feed7d94c0221a (diff) | |
| parent | a1d55bdd530390e58c51abe9707b8d3b0ae3e861 (diff) | |
Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite
Diffstat (limited to 'build_files/build_environment/patches/pthreads.diff')
| -rw-r--r-- | build_files/build_environment/patches/pthreads.diff | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/build_files/build_environment/patches/pthreads.diff b/build_files/build_environment/patches/pthreads.diff index bbabfdc8925..4b6c9766e11 100644 --- a/build_files/build_environment/patches/pthreads.diff +++ b/build_files/build_environment/patches/pthreads.diff @@ -1,13 +1,12 @@ ---- pthread.h.orig 2012-05-26 22:16:45 -0600 -+++ pthread.h 2016-04-01 09:20:36 -0600 -@@ -109,6 +109,10 @@ - /* Include everything */ - #endif +diff -Naur orig/Makefile external_pthreads/Makefile +--- orig/Makefile 2018-08-08 04:47:40 -0600 ++++ external_pthreads/Makefile 2020-05-09 11:20:28 -0600 +@@ -185,7 +185,7 @@ + @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VSEFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_SEH pthreadVSE$(PTW32_VER_DEBUG).inlined_static_stamp -+#if _MSC_VER >= 1900 -+# define HAVE_STRUCT_TIMESPEC 1 -+#endif -+ - #if defined(_UWIN) - # define HAVE_STRUCT_TIMESPEC 1 - # define HAVE_SIGNAL_H 1 + VC-static: +- @ $(MAKE) /E /nologo XCFLAGS="/MT" EHFLAGS="$(VCFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER).inlined_static_stamp ++ @ $(MAKE) /E /nologo XCFLAGS="/MD" EHFLAGS="$(VCFLAGS) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER).inlined_static_stamp + + VC-static-debug: + @ $(MAKE) /E /nologo XCFLAGS="/MTd" EHFLAGS="$(VCFLAGSD) /D__PTW32_STATIC_LIB /D__PTW32_BUILD_INLINED" CLEANUP=__PTW32_CLEANUP_C pthreadVC$(PTW32_VER_DEBUG).inlined_static_stamp |