diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/sound/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/sound/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/space_graph/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/SConscript | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.c | 5 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 |
9 files changed, 3 insertions, 17 deletions
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 391f3a90533..02765726c6e 100644 --- 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 a0a8fbf36d0..8010dd49c57 100644 --- 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 e511c8e963c..6ad95d920c6 100644 --- 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 438a70f4ba5..174894ddfad 100644 --- 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 d776ea5d796..383cc05b7f7 100644 --- 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 7731743aaab..7a3fb6982ef 100644 --- 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 d1a7eeb82e6..fec4b1e693d 100644 --- 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 e107509d844..03c1a012575 100644 --- 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 303890fd630..3785f715803 100644 --- 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 |