diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-10-02 21:09:39 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-10-02 21:09:39 +0400 |
| commit | 07ad83a4398473da1a5f32607f64cd6cdfaa72a3 (patch) | |
| tree | 923a0d8f374b422adda0dcb2dcc1a09b8d429168 /intern/audaspace | |
| parent | 71f772a0ed18daf3ea1729e4568a21320d2c1986 (diff) | |
* Removing libsamplerate from build systems
* Enabling OpenAL for scons win64-vc in default config; Nathan or Sergey: please update the build bot to build with OpenAL!
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | intern/audaspace/SConscript | 5 |
2 files changed, 1 insertions, 18 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index b7571adf3d5..cc30e6685f0 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -262,20 +262,6 @@ if(WITH_CODEC_SNDFILE) ) endif() -if(WITH_SAMPLERATE) - add_definitions(-DWITH_SAMPLERATE) - list(APPEND INC_SYS - ${SAMPLERATE_INCLUDE_DIRS} - ) - list(APPEND SRC - SRC/AUD_SRCResampleFactory.cpp - SRC/AUD_SRCResampleReader.cpp - - SRC/AUD_SRCResampleFactory.h - SRC/AUD_SRCResampleReader.h - ) -endif() - if(WITH_FFTW3 AND FALSE) add_definitions(-DWITH_FFTW3) list(APPEND INC diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 67f859b0e5f..acf7b839f79 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp') + env.Glob('SRC/*.cpp') -incs = '. intern FX SRC ' + env['BF_PTHREADS_INC'] + ' ' + env['BF_LIBSAMPLERATE_INC'] +ncs = '. intern FX SRC ' + env['BF_PTHREADS_INC'] defs = [] if env['WITH_BF_FFMPEG']: @@ -44,7 +44,4 @@ if env['WITH_BF_PYTHON']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -# not optional with scons yet -defs.append('WITH_SAMPLERATE') - env.BlenderLib ('bf_intern_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] ) |