[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31398] trunk/blender: Audaspace: This should fix all missing python includes now once for all...
Joerg Mueller
nexyon at gmail.com
Mon Aug 16 22:05:59 CEST 2010
Revision: 31398
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31398
Author: nexyon
Date: 2010-08-16 22:05:59 +0200 (Mon, 16 Aug 2010)
Log Message:
-----------
Audaspace: This should fix all missing python includes now once for all...
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/intern/audaspace/intern/AUD_C-API.h
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/sound/SConscript
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/SConscript
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
trunk/blender/intern/audaspace/intern/AUD_PyInit.h
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp 2010-08-16 20:05:59 UTC (rev 31398)
@@ -29,6 +29,7 @@
#endif
#ifndef DISABLE_PYTHON
+#include "AUD_PyInit.h"
#include "AUD_PyAPI.h"
Device* g_device;
Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.h 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.h 2010-08-16 20:05:59 UTC (rev 31398)
@@ -26,10 +26,6 @@
#ifndef AUD_CAPI
#define AUD_CAPI
-#ifndef DISABLE_PYTHON
-#include "Python.h"
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -84,14 +80,7 @@
*/
extern void AUD_exit();
-#ifndef DISABLE_PYTHON
/**
- * Initalizes the Python module.
- */
-extern PyObject* AUD_initPython();
-#endif
-
-/**
* Locks the playback device.
*/
extern void AUD_lock();
Copied: trunk/blender/intern/audaspace/intern/AUD_PyInit.h (from rev 31396, trunk/blender/intern/audaspace/intern/AUD_C-API.h)
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_PyInit.h (rev 0)
+++ trunk/blender/intern/audaspace/intern/AUD_PyInit.h 2010-08-16 20:05:59 UTC (rev 31398)
@@ -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
Modified: trunk/blender/source/blender/editors/sound/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/sound/CMakeLists.txt 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/editors/sound/CMakeLists.txt 2010-08-16 20:05:59 UTC (rev 31398)
@@ -30,7 +30,6 @@
../../makesdna
../../makesrna
../../windowmanager
- ${PYTHON_INC}
)
BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/sound/SConscript
===================================================================
--- trunk/blender/source/blender/editors/sound/SConscript 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/editors/sound/SConscript 2010-08-16 20:05:59 UTC (rev 31398)
@@ -7,8 +7,6 @@
incs += ' ../../windowmanager #/intern/guardedalloc'
incs += ' ../../makesrna'
incs += ' #/intern/audaspace/intern'
-if env['WITH_BF_PYTHON']:
- incs += ' ' + env['BF_PYTHON_INC']
defs = []
Modified: trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_graph/CMakeLists.txt 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/editors/space_graph/CMakeLists.txt 2010-08-16 20:05:59 UTC (rev 31398)
@@ -30,7 +30,6 @@
../../makesrna
../../windowmanager
../../../../intern/audaspace/intern
- ${PYTHON_INC}
)
BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_graph/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_graph/SConscript 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/editors/space_graph/SConscript 2010-08-16 20:05:59 UTC (rev 31398)
@@ -6,7 +6,5 @@
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] )
Modified: trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt 2010-08-16 20:05:59 UTC (rev 31398)
@@ -31,7 +31,6 @@
../../makesrna
../../windowmanager
../../../../intern/audaspace/intern
- ${PYTHON_INC}
)
BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_sequencer/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/SConscript 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/editors/space_sequencer/SConscript 2010-08-16 20:05:59 UTC (rev 31398)
@@ -7,7 +7,5 @@
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] )
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2010-08-16 20:05:59 UTC (rev 31398)
@@ -85,9 +85,7 @@
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':
Modified: trunk/blender/source/blender/python/intern/bpy.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy.c 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/blender/python/intern/bpy.c 2010-08-16 20:05:59 UTC (rev 31398)
@@ -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"
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-08-16 19:51:29 UTC (rev 31397)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp 2010-08-16 20:05:59 UTC (rev 31398)
@@ -47,7 +47,7 @@
}
#define WITH_PYTHON
-#include "AUD_C-API.h"
+#include "AUD_PyInit.h"
#endif
More information about the Bf-blender-cvs
mailing list