Audaspace: Buildsystem update after Ton destroyed building with scons and cmake,...

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 2a757646e07441901163e93626235965737ab27f..7e226145adccc914177cc9f8788d598875c6913c 100644 (file)
--- 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 02156169b0df5c0940e069684c61b669ad18ad06..9b9862d15a28b120083a45110d09ec0dbda5dc5a 100644 (file)
--- 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 02765726c6e9c6ea37394849432b6d3b97fea9c0..391f3a9053368f9f1af83c004d8077be5d2173df 100644 (file)
--- 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 6ad95d920c606fd82665e8555bd1487db6fe0d7e..e511c8e963cb0aaa9663850f4506b650ab246c89 100644 (file)
--- 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 383cc05b7f7b7bd07534d8b15b0b76710cf66099..d776ea5d79642608ab90aca4e9cf4ae93daf5cf4 100644 (file)
--- 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}")