diff options
| author | Alexandr Kuznetsov <kuzsasha@gmail.com> | 2013-11-29 23:50:59 +0400 |
|---|---|---|
| committer | Alexandr Kuznetsov <kuzsasha@gmail.com> | 2013-11-30 00:13:12 +0400 |
| commit | e2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa (patch) | |
| tree | c8fd591ec86f46a00464a8500d6a523def190abf /extern | |
| parent | cd4fd5056269858c6b85a9eec9929fecbe968695 (diff) | |
Woo Hoo. First git commit.
Changes for VC2013
Now, I can build Blender with VC2013 with Cycles, Collada, OpenExr,OpenImageIO disabled. Also, you need VC2008 sp1 installed to make old libs compatible.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/libmv/numeric/numeric.h | 2 | ||||
| -rw-r--r-- | extern/libmv/third_party/glog/src/logging.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/extern/libmv/libmv/numeric/numeric.h b/extern/libmv/libmv/numeric/numeric.h index a95723d59cf..81705c4b370 100644 --- a/extern/libmv/libmv/numeric/numeric.h +++ b/extern/libmv/libmv/numeric/numeric.h @@ -44,9 +44,11 @@ inline long lround(double d) { return (long)(d>0 ? d+0.5 : ceil(d-0.5)); } +#if _MSC_VER < 1800 inline int round(double d) { return (d>0) ? int(d+0.5) : int(d-0.5); } +#endif typedef unsigned int uint; #endif // _WIN32 diff --git a/extern/libmv/third_party/glog/src/logging.cc b/extern/libmv/third_party/glog/src/logging.cc index f36e14d2ce4..57d5e24122c 100644 --- a/extern/libmv/third_party/glog/src/logging.cc +++ b/extern/libmv/third_party/glog/src/logging.cc @@ -34,6 +34,7 @@ #include <assert.h> #include <iomanip> #include <string> +#include <algorithm> #ifdef HAVE_UNISTD_H # include <unistd.h> // For _exit. #endif |