forked from bartvdbraak/blender
Audaspace: This should fix all missing python includes now once for all...
This commit is contained in:
parent
54de782faf
commit
26809f38aa
@ -29,6 +29,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_PYTHON
|
||||
#include "AUD_PyInit.h"
|
||||
#include "AUD_PyAPI.h"
|
||||
|
||||
Device* g_device;
|
||||
|
@ -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.
|
||||
*/
|
||||
|
47
intern/audaspace/intern/AUD_PyInit.h
Normal file
47
intern/audaspace/intern/AUD_PyInit.h
Normal file
@ -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
|
@ -30,7 +30,6 @@ SET(INC
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
${PYTHON_INC}
|
||||
)
|
||||
|
||||
BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
|
||||
|
@ -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 = []
|
||||
|
||||
|
@ -30,7 +30,6 @@ SET(INC
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
../../../../intern/audaspace/intern
|
||||
${PYTHON_INC}
|
||||
)
|
||||
|
||||
BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
|
||||
|
@ -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] )
|
||||
|
@ -31,7 +31,6 @@ SET(INC
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
../../../../intern/audaspace/intern
|
||||
${PYTHON_INC}
|
||||
)
|
||||
|
||||
BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
|
||||
|
@ -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] )
|
||||
|
@ -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':
|
||||
|
@ -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"
|
||||
|
@ -47,7 +47,7 @@ extern "C" {
|
||||
}
|
||||
|
||||
#define WITH_PYTHON
|
||||
#include "AUD_C-API.h"
|
||||
#include "AUD_PyInit.h"
|
||||
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user