From 26809f38aa3cda6f027ff658e64ca898314e673a Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Mon, 16 Aug 2010 20:05:59 +0000 Subject: Audaspace: This should fix all missing python includes now once for all... --- intern/audaspace/intern/AUD_C-API.cpp | 1 + intern/audaspace/intern/AUD_C-API.h | 11 -------- intern/audaspace/intern/AUD_PyInit.h | 47 +++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 intern/audaspace/intern/AUD_PyInit.h (limited to 'intern') diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index 304c5657364..ef1cdee5686 100644 --- 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 56e50bb4b47..4dc074b9288 100644 --- 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 index 00000000000..bd67259449a --- /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 . + * + * ***** 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 -- cgit v1.2.3