Zyq-XDz/blender
0
0
Fork 0
forked from blender/blender
Code Activity
Files
d3e6b08276baefd8663fee017449fc3c15a88615
blender/build_files/build_environment/patches/pthreads.diff

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

13 lines
915 B
Diff
Raw Normal View History

deps/windows: Fix wrong crt for libjpeg and pthreads The msvc linker had been warning about libcmt being dragged in for a bit, finally tracked the issue down to the deps of jpeg and pthreads which both ignored our cflags. this diff changes them both to use the dynamic crt rather than the static one so they'll be in line with all our other libraries.
2020-05-09 12:47:59 -06:00
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
Build: add scripts to build dependencies for Windows and macOS. Note these are intended for platform maintainers, we do not intend to support users making their own builds with these. For that precompiled libraries from lib/ should be used. Implemented by Martijn Berger, Ray Molenkamp and Brecht Van Lommel. Differential Revision: https://developer.blender.org/D2753
2017-07-25 16:37:55 +02:00
deps/windows: Fix wrong crt for libjpeg and pthreads The msvc linker had been warning about libcmt being dragged in for a bit, finally tracked the issue down to the deps of jpeg and pthreads which both ignored our cflags. this diff changes them both to use the dynamic crt rather than the static one so they'll be in line with all our other libraries.
2020-05-09 12:47:59 -06:00
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
Copy Permalink