From e2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa Mon Sep 17 00:00:00 2001 From: Alexandr Kuznetsov Date: Fri, 29 Nov 2013 14:50:59 -0500 Subject: 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. --- extern/libmv/libmv/numeric/numeric.h | 2 ++ extern/libmv/third_party/glog/src/logging.cc | 1 + 2 files changed, 3 insertions(+) (limited to 'extern') 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 #include #include +#include #ifdef HAVE_UNISTD_H # include // For _exit. #endif -- cgit v1.2.3