From 8d7204ac040a1a7aeeacb2078136ee8da4edbc4c Mon Sep 17 00:00:00 2001
From: Joerg Mueller <nexyon@gmail.com>
Date: Mon, 16 Aug 2010 18:22:51 +0000
Subject: [PATCH] Audaspace: Buildsystem update after Ton destroyed building
 with scons and cmake, also including a patch by freakabcd fixing some missing
 python include paths.

---
 intern/audaspace/CMakeLists.txt                       | 3 ++-
 intern/audaspace/SConscript                           | 3 ++-
 source/blender/editors/sound/CMakeLists.txt           | 1 +
 source/blender/editors/space_graph/CMakeLists.txt     | 1 +
 source/blender/editors/space_sequencer/CMakeLists.txt | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 2a757646e07..7e226145adc 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -63,7 +63,8 @@ ENDIF(WITH_SNDFILE)
 IF(WITH_PYTHON)
 	SET(INC ${INC} Python ${PYTHON_INC})
 	FILE(GLOB PYTHONSRC Python/*.cpp)
-	ADD_DEFINITIONS(-DWITH_PYTHON)
+ELSE(WITH_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index 02156169b0d..9b9862d15a2 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -39,7 +39,8 @@ if env['WITH_BF_SNDFILE']:
 if env['WITH_BF_PYTHON']:
 	sources += env.Glob('Python/*.cpp')
 	incs += ' Python ' + env['BF_PYTHON_INC']
-	defs.append('WITH_PYTHON')
+else:
+	defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index 02765726c6e..391f3a90533 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -30,6 +30,7 @@ SET(INC
 	../../makesdna
 	../../makesrna
 	../../windowmanager
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index 6ad95d920c6..e511c8e963c 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -30,6 +30,7 @@ SET(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/audaspace/intern
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 383cc05b7f7..d776ea5d796 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -31,6 +31,7 @@ SET(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/audaspace/intern
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")