Woo Hoo. First git commit.
authorAlexandr Kuznetsov <kuzsasha@gmail.com>
Fri, 29 Nov 2013 19:50:59 +0000 (14:50 -0500)
committerAlexandr Kuznetsov <kuzsasha@gmail.com>
Fri, 29 Nov 2013 20:13:12 +0000 (15:13 -0500)
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.

12 files changed:
extern/libmv/libmv/numeric/numeric.h
extern/libmv/third_party/glog/src/logging.cc
intern/audaspace/intern/AUD_JOSResampleReader.cpp
intern/elbeem/intern/ntl_blenderdumper.cpp
intern/elbeem/intern/particletracer.cpp
source/blender/blenlib/BLI_math_base.h
source/blender/compositor/intern/COM_Node.h
source/blender/freestyle/intern/application/AppConfig.h
source/blender/freestyle/intern/geometry/BBox.h
source/blender/freestyle/intern/stroke/StrokeRenderer.h
source/blender/freestyle/intern/view_map/GridDensityProvider.h
source/blender/imbuf/intern/openexr/openexr_api.cpp

index a95723d59cf471fb3a852bb67042bc6babe91fa9..81705c4b3706326f9409ba0a54ce0464b75b8abb 100644 (file)
   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
 
index f36e14d2ce40b46524fa40c6bc58eae99b21ac72..57d5e24122ccf73748261d665d2c2b7090ee9f2b 100644 (file)
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <iomanip>
 #include <string>
+#include <algorithm>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>  // For _exit.
 #endif
index 87577da95cca05064ebcb1464c7c9a4f30775305..0448c75d777838702d5f39b97d73fa6316ec0598 100644 (file)
@@ -36,6 +36,7 @@
 
 /* MSVC does not have lrint */
 #ifdef _MSC_VER
+#if _MSC_VER < 1800  
 #ifdef _M_X64
 #include <emmintrin.h>
 static inline int lrint(double d)
@@ -56,6 +57,7 @@ static inline int lrint(double d)
 }
 #endif
 #endif
+#endif
 
 // UNUSED
 // #define CC m_channels + channel
index 4efff4337a638b68cfa3970d749af7f5a01fd860..ec05c25004d70f9e374afeb65fc7ee1fef39108c 100644 (file)
@@ -164,7 +164,7 @@ int ntlBlenderDumper::renderScene( void )
                                boutfilename << ".bobj.gz";
                                gzf = gzopen(boutfilename.str().c_str(), "wb1"); // wb9 is slow for large meshes!
                                if (!gzf) {
-                                       errMsg("ntlBlenderDumper::renderScene","Unable to open output '"<<boutfilename<<"' ");
+                                       errMsg("ntlBlenderDumper::renderScene","Unable to open output '" + boutfilename.str() + "' ");
                                        return 1; }
 
                                // dont transform velocity output, this is handled in blender
index 593b582d91f370035e49ef99ec4dc7fad4d6d23a..2f1f5f8efbbb19bffd7510d6120449f46b9768f6 100644 (file)
@@ -233,7 +233,7 @@ void ParticleTracer::checkDumpTextPositions(double simtime) {
                if(mDumpTextFile.length()>1) {   
                        boutfilename << mDumpTextFile <<  ".cpart2"; 
                } else {                           
-                       boutfilename << boutfilename <<"_particles" <<  ".cpart2"; 
+                       boutfilename << "_particles" <<  ".cpart2"; 
                }
                debMsgStd("ParticleTracer::checkDumpTextPositions",DM_MSG,"T-Dumping: "<< this->getName() <<", particles:"<<mParts.size()<<" "<< " to "<<boutfilename.str()<<" " , 7);
 
index f7e6dc142951c0c21bf0a2b41332bb1ecec8a29e..14c1055cd3ab3653d98eab14d4b498733fcd6262 100644 (file)
@@ -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
 
index fb5dfe2e9b77035bc37ffd48a412f90b177cf777..c14a1973da571739da42f7ebb2074e0457fe407e 100644 (file)
@@ -32,6 +32,7 @@
 #include "COM_ExecutionSystem.h"
 #include <vector>
 #include <string>
+#include <algorithm>
 
 using namespace std;
 
index ad64fce2c44361de0a043918f999df8df022db3f..94ae0c3c34841db3c64ed3bc3b5d3717fbd3d6a1 100644 (file)
@@ -29,6 +29,7 @@
  */
 
 #include <string>
+#include <algorithm>
 #include "../system/FreestyleConfig.h"
 #include "../system/Precision.h"
 
index c557c2a6368b71440d50f9f1895f5360e8903720..54fd39800ccb2b9a86c4d31e734768cd0f87bc20 100644 (file)
@@ -29,6 +29,7 @@
  */
 
 #include <stdlib.h>
+#include <algorithm>
 
 #include "BLI_utildefines.h"
 
index e5478c81b4091a37a78e1e81ff2e3a5a29594729..90f41a0d0acc9cff9e39bb061146b69d15d7360c 100644 (file)
@@ -30,6 +30,7 @@
 
 #include <map>
 #include <string.h>
+#include <algorithm>
 #include <utility>
 #include <vector>
 
index f14362e3deb6785980d0c428029b683b5b1104d3..272d64dd6de21e055b3396daf729309b749370d4 100644 (file)
@@ -29,6 +29,7 @@
  */
 
 #include <stdexcept>
+#include <algorithm>
 #include <memory>
 
 #include "OccluderSource.h"
index 922c865a0d5aea5701e7898534be6beccd165df8..b25a224e16cbf37cc7d43e7722329a51f699bf3c 100644 (file)
@@ -36,6 +36,7 @@
 #include <string>
 #include <set>
 #include <errno.h>
+#include <algorithm>
 
 #include <openexr_api.h>