[Bf-blender-cvs] [afc1a71] depsgraph_refactor: More mingw64 and c++11 fixes - hypot() is not defined
Joshua Leung
noreply at git.blender.org
Mon Dec 1 12:29:34 CET 2014
Commit: afc1a711b4c41ad1019912a4cd246afc40093e2a
Author: Joshua Leung
Date: Tue Dec 2 00:28:30 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rBafc1a711b4c41ad1019912a4cd246afc40093e2a
More mingw64 and c++11 fixes - hypot() is not defined
Fix is from the following thread(s):
* http://bugs.python.org/issue11566
* http://boost.2283326.n4.nabble.com/Boost-Python-Compile-Error-s-GCC-via-MinGW-w64-td3165793.html#a3166760
I haven't managed to fix this for all files here yet (this only fixes half of the files
for the freestyle module), so in the meantime, it'll be necessary to disable
the freestyle module. The same goes for Audaspace, which fails on the C APi currently.
===================================================================
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/python/BPy_BBox.h
M source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
M source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
M source/blender/freestyle/intern/python/BPy_ContextFunctions.h
M source/blender/freestyle/intern/python/BPy_Convert.h
M source/blender/freestyle/intern/python/BPy_Freestyle.h
M source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
M source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
M source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
M source/blender/freestyle/intern/python/BPy_ViewMap.h
M source/blender/freestyle/intern/python/BPy_ViewShape.h
M source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
M source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
===================================================================
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 237176d..a5e721a 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -23,6 +23,7 @@
*/
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index 089c216..89999ba 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_BBOX_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index a9a2297..3a67977 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index 43511ed..4dfa40b 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
index 4065277..728afba 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index e6e763e..50e8a5d 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_CONVERT_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
index 0ed2e00..d057dd7 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -27,6 +27,7 @@
#ifdef __cplusplus
extern "C" {
+#include <math.h>
#endif
#include <Python.h>
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index 58126d5..751e49e 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index 0b38b3d..5458e14 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
index bbbec57..562ee50 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h
index cd42e94..5c9311d 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_VIEWMAP_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h
index 09bf36e..145fcaa 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -26,6 +26,7 @@
#define __FREESTYLE_PYTHON_VIEWSHAPE_H__
extern "C" {
+#include <math.h>
#include <Python.h>
}
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
index 46294c0..f4c84e9 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.h
@@ -29,6 +29,7 @@
#ifdef __cplusplus
extern "C" {
+#include <math.h>
#endif
struct MTex;
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
index 038d002..54540e1 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureStepShader.h
@@ -29,6 +29,7 @@
#ifdef __cplusplus
extern "C" {
+#include <math.h>
#endif
///////////////////////////////////////////////////////////////////////////////////////////
More information about the Bf-blender-cvs
mailing list