diff options
author | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 22:22:51 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 22:22:51 +0400 |
commit | 8d7204ac040a1a7aeeacb2078136ee8da4edbc4c (patch) | |
tree | 77bca6b9e5f26eb0b48d90ff5a550c4941bdac55 /intern | |
parent | db38a7f2cc696fb57d579c63b3350e6114cd3087 (diff) |
Audaspace: Buildsystem update after Ton destroyed building with scons and cmake, also including a patch by freakabcd fixing some missing python include paths.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 3 | ||||
-rw-r--r-- | intern/audaspace/SConscript | 3 |
2 files changed, 4 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'] |