[Bf-blender-cvs] [2eda522] depsgraph_refactor: More compile fixes for mingw64
Joshua Leung
noreply at git.blender.org
Wed Dec 3 12:55:46 CET 2014
Commit: 2eda5227913d47932a86f50e60cc334fd093efbb
Author: Joshua Leung
Date: Thu Dec 4 00:00:34 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rB2eda5227913d47932a86f50e60cc334fd093efbb
More compile fixes for mingw64
Swapping order of Python and cmath includes again for audaspace
===================================================================
M intern/audaspace/Python/AUD_PyAPI.cpp
M intern/audaspace/intern/AUD_C-API.cpp
===================================================================
diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp
index b00289b..3221f14 100644
--- a/intern/audaspace/Python/AUD_PyAPI.cpp
+++ b/intern/audaspace/Python/AUD_PyAPI.cpp
@@ -26,6 +26,7 @@
* \ingroup audpython
*/
+#include <cmath>
#include "AUD_PyAPI.h"
#include <structmember.h>
diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index 45d72cc..91f21ea 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -36,10 +36,6 @@
// pass
#endif
-#ifdef WITH_PYTHON
-# include "AUD_PyInit.h"
-# include "AUD_PyAPI.h"
-#endif
#include <set>
#include <cstdlib>
@@ -48,6 +44,11 @@
#include <sstream>
#include <iostream>
+#ifdef WITH_PYTHON
+# include "AUD_PyInit.h"
+# include "AUD_PyAPI.h"
+#endif
+
#include "AUD_NULLDevice.h"
#include "AUD_I3DDevice.h"
#include "AUD_I3DHandle.h"
More information about the Bf-blender-cvs
mailing list