kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix compilation of new tracker for MinGW/MinGW64

Browse Source
This commit is contained in:
Antony Riakiotakis 2012-06-11 13:00:35 +00:00
parent 5248ec57d9
commit 5f1eec564f
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/libmv/third_party/ceres/internal/ceres/collections_port.h vendored
View File

@ -53,7 +53,7 @@ struct HashMap : tr1::unordered_map<K, V> {};
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

13
extern/libmv/third_party/ceres/patches/collections_port.h.mingw.patch vendored Normal file
View File

@ -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