diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-27 00:03:07 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-27 00:03:07 +0400 |
| commit | 7505de5c597946409699f0c48a3b9b1d178d7071 (patch) | |
| tree | 7c4cbcce600f911dccab142ebdc8d46da6c6c449 /extern/libmv | |
| parent | 4bd96adbcf549c40c30f674476b47e699535a5f6 (diff) | |
Camera tracking integration
===========================
Attempt to fix MinGW compilaiton.
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/libmv/numeric/numeric.h | 2 | ||||
| -rw-r--r-- | extern/libmv/patches/mingw.patch | 13 | ||||
| -rw-r--r-- | extern/libmv/patches/series | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/extern/libmv/libmv/numeric/numeric.h b/extern/libmv/libmv/numeric/numeric.h index f39d126c0f2..21e0f067446 100644 --- a/extern/libmv/libmv/numeric/numeric.h +++ b/extern/libmv/libmv/numeric/numeric.h @@ -40,7 +40,7 @@ } #endif //_WIN32 || __APPLE__ -#if _WIN32 +#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__) inline long lround(double d) { return (long)(d>0 ? d+0.5 : ceil(d-0.5)); } diff --git a/extern/libmv/patches/mingw.patch b/extern/libmv/patches/mingw.patch new file mode 100644 index 00000000000..0b08a483bea --- /dev/null +++ b/extern/libmv/patches/mingw.patch @@ -0,0 +1,13 @@ +diff --git a/src/libmv/numeric/numeric.h b/src/libmv/numeric/numeric.h +index f39d126..21e0f06 100644 +--- a/src/libmv/numeric/numeric.h ++++ b/src/libmv/numeric/numeric.h +@@ -40,7 +40,7 @@ + } + #endif //_WIN32 || __APPLE__ + +-#if _WIN32 ++#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__) + inline long lround(double d) { + return (long)(d>0 ? d+0.5 : ceil(d-0.5)); + } diff --git a/extern/libmv/patches/series b/extern/libmv/patches/series index 8b0e7406634..f8048e27718 100644 --- a/extern/libmv/patches/series +++ b/extern/libmv/patches/series @@ -6,3 +6,4 @@ config_mac.patch levenberg_marquardt.patch function_derivative.patch high_distortion_crash_fix.patch +mingw.patch |