Revision: 47743
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47743
Author: psy-fi
Date: 2012-06-11 13:00:35 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Fix compilation of new tracker for MinGW/MinGW64
Modified Paths:
--------------
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
Added Paths:
-----------
trunk/blender/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
Modified:
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
===================================================================
---
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
2012-06-11 12:13:41 UTC (rev 47742)
+++
trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
2012-06-11 13:00:35 UTC (rev 47743)
@@ -53,7 +53,7 @@
template<typename K>
struct HashSet : tr1::unordered_set<K> {};
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
#define GG_LONGLONG(x) x##I64
#define GG_ULONGLONG(x) x##UI64
#else
Added:
trunk/blender/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
===================================================================
---
trunk/blender/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
(rev 0)
+++
trunk/blender/extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch
2012-06-11 13:00:35 UTC (rev 47743)
@@ -0,0 +1,13 @@
+Index: internal/ceres/collections_port.h
+===================================================================
+--- internal/ceres/collections_port.h (revision 47730)
++++ internal/ceres/collections_port.h (working copy)
+@@ -53,7 +53,7 @@
+ template<typename K>
+ struct HashSet : tr1::unordered_set<K> {};
+
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
+ #define GG_LONGLONG(x) x##I64
+ #define GG_ULONGLONG(x) x##UI64
+ #else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
