Audaspace: This should fix all missing python includes now once for all...

diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp
index 304c5657364d61d453874b32221316cc5b031b69..ef1cdee568679663ed1e7633b09e625774d632d7 100644 (file)
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -29,6 +29,7 @@
 #endif
 
 #ifndef DISABLE_PYTHON
+#include "AUD_PyInit.h"
 #include "AUD_PyAPI.h"
 
 Device* g_device;

diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h
index 56e50bb4b47200a3853c85c6733312440aba217a..4dc074b9288f163a43aa472bcd79fd6ffa1e5685 100644 (file)
--- a/intern/audaspace/intern/AUD_C-API.h
+++ b/intern/audaspace/intern/AUD_C-API.h
@@ -26,10 +26,6 @@
 #ifndef AUD_CAPI
 #define AUD_CAPI
 
-#ifndef DISABLE_PYTHON
-#include "Python.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -84,13 +80,6 @@ extern int* AUD_enumDevices();
  */
 extern void AUD_exit();
 
-#ifndef DISABLE_PYTHON
-/**
- * Initalizes the Python module.
- */
-extern PyObject* AUD_initPython();
-#endif
-
 /**
  * Locks the playback device.
  */

diff --git a/intern/audaspace/intern/AUD_PyInit.h b/intern/audaspace/intern/AUD_PyInit.h
new file mode 100644 (file)
index 0000000..bd67259
--- /dev/null
+++ b/intern/audaspace/intern/AUD_PyInit.h
@@ -0,0 +1,47 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2010 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_PYINIT
+#define AUD_PYINIT
+
+#ifndef DISABLE_PYTHON
+#include "Python.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Initalizes the Python module.
+ */
+extern PyObject* AUD_initPython();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif //AUD_PYINIT

diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 391f3a9053368f9f1af83c004d8077be5d2173df..02765726c6e9c6ea37394849432b6d3b97fea9c0 100644 (file)
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -30,7 +30,6 @@ SET(INC
        ../../makesdna
        ../../makesrna
        ../../windowmanager
-       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")

diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript
index a0a8fbf36d099867da66ee92e217bc6785eeed7b..8010dd49c5713809295a58413e6e5693dc3f231e 100644 (file)
--- a/source/blender/editors/sound/SConscript
+++ b/source/blender/editors/sound/SConscript
@@ -7,8 +7,6 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc'
 incs += ' ../../makesrna'
 incs += ' #/intern/audaspace/intern'
-if env['WITH_BF_PYTHON']:
-    incs += ' ' + env['BF_PYTHON_INC']
 
 defs = []
 

diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index e511c8e963cb0aaa9663850f4506b650ab246c89..6ad95d920c606fd82665e8555bd1487db6fe0d7e 100644 (file)
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -30,7 +30,6 @@ SET(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/audaspace/intern
-       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")

diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript
index 438a70f4ba59c930807c4732b3861e9c131d03be..174894ddfada8e07bed172238a9e470ad50aa763 100644 (file)
--- a/source/blender/editors/space_graph/SConscript
+++ b/source/blender/editors/space_graph/SConscript
@@ -6,7 +6,5 @@ sources = env.Glob('*.c')
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' #/intern/audaspace/intern'
-if env['WITH_BF_PYTHON']:
-    incs += ' ' + env['BF_PYTHON_INC']
 
 env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] )

diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index d776ea5d79642608ab90aca4e9cf4ae93daf5cf4..383cc05b7f7b7bd07534d8b15b0b76710cf66099 100644 (file)
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -31,7 +31,6 @@ SET(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/audaspace/intern
-       ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")

diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript
index 7731743aaab5f9c212fdaa9a7bd8ffe5a8d99331..7a3fb6982efd591478f0e71c32835386ecce192a 100644 (file)
--- a/source/blender/editors/space_sequencer/SConscript
+++ b/source/blender/editors/space_sequencer/SConscript
@@ -7,7 +7,5 @@ incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna'
 incs += ' #/intern/audaspace/intern'
-if env['WITH_BF_PYTHON']:
-    incs += ' ' + env['BF_PYTHON_INC']
 
 env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] )

diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index d1a7eeb82e6feacf186a9e219da23af054a2518f..fec4b1e693d03ec4bdf0a7cfb7ae587f4ccffca0 100644 (file)
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -85,9 +85,7 @@ if env['WITH_BF_JACK']:
 if env['BF_UNIT_TEST']:
        defs.append('UNIT_TEST')
 
-if env['WITH_BF_PYTHON']:
-       incs  += ' ' + env['BF_PYTHON_INC']
-else:
+if not env['WITH_BF_PYTHON']:
        defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':

diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index e107509d844a39abdab42f90c952cbb406be257e..03c1a0125750a3da2dd1071fcbcddb0a13c3ba5b 100644 (file)
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -41,10 +41,7 @@
 #include "../generic/blf_api.h"
 #include "../generic/IDProp.h"
 
-#ifndef DISABLE_PYTHON
-#define WITH_PYTHON
-#endif
-#include "AUD_C-API.h"
+#include "AUD_PyInit.h"
 
 static char bpy_script_paths_doc[] =
 ".. function:: script_paths()\n"

diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 303890fd6302bdc94d2b8179fdf5b061b54371ef..3785f7158038821a7c87ecafc7edfd4173347928 100644 (file)
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -47,7 +47,7 @@ extern "C" {
 }
 
 #define WITH_PYTHON
-#include "AUD_C-API.h"
+#include "AUD_PyInit.h"
 
 #endif