[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31392] trunk/blender: Audaspace: Buildsystem update after Ton destroyed building with scons and cmake, also including a patch by freakabcd fixing some missing python include paths .

[Joerg Mueller]

Revision: 31392
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31392
Author:   nexyon
Date:     2010-08-16 20:22:51 +0200 (Mon, 16 Aug 2010)

Log Message:
-----------
Audaspace: Buildsystem update after Ton destroyed building with scons and cmake, also including a patch by freakabcd fixing some missing python include paths.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/CMakeLists.txt
    trunk/blender/intern/audaspace/SConscript
    trunk/blender/source/blender/editors/sound/CMakeLists.txt
    trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
    trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt

Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt	2010-08-16 18:13:26 UTC (rev 31391)
+++ trunk/blender/intern/audaspace/CMakeLists.txt	2010-08-16 18:22:51 UTC (rev 31392)
@@ -63,7 +63,8 @@
 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})

Modified: trunk/blender/intern/audaspace/SConscript
===================================================================
--- trunk/blender/intern/audaspace/SConscript	2010-08-16 18:13:26 UTC (rev 31391)
+++ trunk/blender/intern/audaspace/SConscript	2010-08-16 18:22:51 UTC (rev 31392)
@@ -39,7 +39,8 @@
 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']

Modified: trunk/blender/source/blender/editors/sound/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/sound/CMakeLists.txt	2010-08-16 18:13:26 UTC (rev 31391)
+++ trunk/blender/source/blender/editors/sound/CMakeLists.txt	2010-08-16 18:22:51 UTC (rev 31392)
@@ -30,6 +30,7 @@
 	../../makesdna
 	../../makesrna
 	../../windowmanager
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_sound "${SRC}" "${INC}")

Modified: trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_graph/CMakeLists.txt	2010-08-16 18:13:26 UTC (rev 31391)
+++ trunk/blender/source/blender/editors/space_graph/CMakeLists.txt	2010-08-16 18:22:51 UTC (rev 31392)
@@ -30,6 +30,7 @@
 	../../makesrna
 	../../windowmanager
 	../../../../intern/audaspace/intern
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")

Modified: trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt	2010-08-16 18:13:26 UTC (rev 31391)
+++ trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt	2010-08-16 18:22:51 UTC (rev 31392)
@@ -31,6 +31,7 @@
 	../../makesrna
 	../../windowmanager
 	../../../../intern/audaspace/intern
+	${PYTHON_INC}
 )
 
 BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")