[Bf-blender-cvs] [f7cc90105a3] tmp_libupdate_34: deps: fix opencollada build on windows

Ray Molenkamp noreply at git.blender.org
Sat Aug 20 01:38:00 CEST 2022


Commit: f7cc90105a341f12149a58f2cb6d3dee8672197e
Author: Ray Molenkamp
Date:   Fri Aug 19 17:35:27 2022 -0600
Branches: tmp_libupdate_34
https://developer.blender.org/rBf7cc90105a341f12149a58f2cb6d3dee8672197e

deps: fix opencollada build on windows

opencollada was not compatible with vs 2019 as
build system, tr1 headers are no longer available
as they are just regular headers now.

===================================================================

M	build_files/build_environment/patches/opencollada.diff

===================================================================

diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff
index e8efc1a6909..5ae2d06e120 100644
--- a/build_files/build_environment/patches/opencollada.diff
+++ b/build_files/build_environment/patches/opencollada.diff
@@ -130,3 +130,15 @@ index 715d903..24423ce 100644
  		{
  			string id = node.attribute("id").value();
  			size_t line = node.line();
+diff -Naur OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h
+--- OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h	2018-11-26 14:43:10 -0700
++++ external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h	2022-08-19 11:36:04 -0600
+@@ -23,7 +23,7 @@
+ #	include <tr1/unordered_map>
+ #endif
+ 
+-#ifdef _LIBCPP_VERSION
++#if defined(_LIBCPP_VERSION) || defined(WIN32)
+ // If we're compiling with libc++, create a namespace alias for tr1 that points to std.
+ // Not particularly elegant, and largely should be filed under "hack", but it works for OS X with clang for now.
+ namespace std {



More information about the Bf-blender-cvs mailing list