From e2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa Mon Sep 17 00:00:00 2001
From: Alexandr Kuznetsov <kuzsasha@gmail.com>
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.
---
 source/blender/blenlib/BLI_math_base.h                         | 8 ++++++--
 source/blender/compositor/intern/COM_Node.h                    | 1 +
 source/blender/freestyle/intern/application/AppConfig.h        | 1 +
 source/blender/freestyle/intern/geometry/BBox.h                | 1 +
 source/blender/freestyle/intern/stroke/StrokeRenderer.h        | 1 +
 source/blender/freestyle/intern/view_map/GridDensityProvider.h | 1 +
 source/blender/imbuf/intern/openexr/openexr_api.cpp            | 1 +
 7 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index f7e6dc14295..14c1055cd3a 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -144,9 +144,13 @@ static const int NAN_INT = 0x7FC00000;
 
 #ifdef WIN32
 #  ifndef FREE_WINDOWS
-#    define isnan(n) _isnan(n)
+#    ifndef isnan
+#		define isnan(n) _isnan(n)
+#	 endif
 #    define finite _finite
-#    define hypot _hypot
+#    ifndef hypot
+#		define hypot(a, b) _hypot(a, b)
+#	endif
 #  endif
 #endif
 
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index fb5dfe2e9b7..c14a1973da5 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -32,6 +32,7 @@
 #include "COM_ExecutionSystem.h"
 #include <vector>
 #include <string>
+#include <algorithm>
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h
index ad64fce2c44..94ae0c3c348 100644
--- a/source/blender/freestyle/intern/application/AppConfig.h
+++ b/source/blender/freestyle/intern/application/AppConfig.h
@@ -29,6 +29,7 @@
  */
 
 #include <string>
+#include <algorithm>
 #include "../system/FreestyleConfig.h"
 #include "../system/Precision.h"
 
diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h
index c557c2a6368..54fd39800cc 100644
--- a/source/blender/freestyle/intern/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
@@ -29,6 +29,7 @@
  */
 
 #include <stdlib.h>
+#include <algorithm>
 
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
index e5478c81b40..90f41a0d0ac 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
@@ -30,6 +30,7 @@
 
 #include <map>
 #include <string.h>
+#include <algorithm>
 #include <utility>
 #include <vector>
 
diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
index f14362e3deb..272d64dd6de 100644
--- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h
+++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
@@ -29,6 +29,7 @@
  */
 
 #include <stdexcept>
+#include <algorithm>
 #include <memory>
 
 #include "OccluderSource.h"
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 922c865a0d5..b25a224e16c 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -36,6 +36,7 @@
 #include <string>
 #include <set>
 #include <errno.h>
+#include <algorithm>
 
 #include <openexr_api.h>
 
-- 
cgit v1.2.3