[Bf-blender-cvs] [e2429d6] master: Woo Hoo. First git commit.
Alexandr Kuznetsov
noreply at git.blender.org
Fri Nov 29 22:33:27 CET 2013
Commit: e2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa
Author: Alexandr Kuznetsov
Date: Fri Nov 29 14:50:59 2013 -0500
http://developer.blender.org/rBe2429d6492bb58a87bcbee29a0f78a6ea6bb6dfa
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.
===================================================================
M extern/libmv/libmv/numeric/numeric.h
M extern/libmv/third_party/glog/src/logging.cc
M intern/audaspace/intern/AUD_JOSResampleReader.cpp
M intern/elbeem/intern/ntl_blenderdumper.cpp
M intern/elbeem/intern/particletracer.cpp
M source/blender/blenlib/BLI_math_base.h
M source/blender/compositor/intern/COM_Node.h
M source/blender/freestyle/intern/application/AppConfig.h
M source/blender/freestyle/intern/geometry/BBox.h
M source/blender/freestyle/intern/stroke/StrokeRenderer.h
M source/blender/freestyle/intern/view_map/GridDensityProvider.h
M source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
diff --git a/extern/libmv/libmv/numeric/numeric.h b/extern/libmv/libmv/numeric/numeric.h
index a95723d..81705c4 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 f36e14d..57d5e24 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
diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.cpp b/intern/audaspace/intern/AUD_JOSResampleReader.cpp
index 87577da..0448c75 100644
--- a/intern/audaspace/intern/AUD_JOSResampleReader.cpp
+++ b/intern/audaspace/intern/AUD_JOSResampleReader.cpp
@@ -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
diff --git a/intern/elbeem/intern/ntl_blenderdumper.cpp b/intern/elbeem/intern/ntl_blenderdumper.cpp
index 4efff43..ec05c25 100644
--- a/intern/elbeem/intern/ntl_blenderdumper.cpp
+++ b/intern/elbeem/intern/ntl_blenderdumper.cpp
@@ -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
diff --git a/intern/elbeem/intern/particletracer.cpp b/intern/elbeem/intern/particletracer.cpp
index 593b582..2f1f5f8 100644
--- a/intern/elbeem/intern/particletracer.cpp
+++ b/intern/elbeem/intern/particletracer.cpp
@@ -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);
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index f7e6dc1..14c1055 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 fb5dfe2..c14a197 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 ad64fce..94ae0c3 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 c557c2a..54fd398 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 e5478c8..90f41a0 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 f14362e..272d64d 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 922c865..b25a224 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>
More information about the Bf-blender-cvs
mailing list