diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-08 20:24:31 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-08 20:24:31 +0400 |
| commit | f26d7010ef8df0629421453df1efd00c0d8e1b6f (patch) | |
| tree | bee0401e1cd84a67b87bae3d152258454394adc9 /intern/audaspace | |
| parent | 58f3503e904675c77855c66a46f92cfb47cde952 (diff) | |
Don't compile AUD_JOSResampleReaderCoeff.cpp twice (it's included in AUD_JOSResampleReader.cpp)
Patch from nico_ga, thanks!
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/audaspace/SConscript | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 0c4df1ce392..c3a4c130f88 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -98,7 +98,6 @@ set(SRC intern/AUD_IWriter.h intern/AUD_JOSResampleFactory.cpp intern/AUD_JOSResampleFactory.h - intern/AUD_JOSResampleReaderCoeff.cpp intern/AUD_JOSResampleReader.cpp intern/AUD_JOSResampleReader.h intern/AUD_LinearResampleFactory.cpp diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index b8d5a56a625..5fb776e742f 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -3,6 +3,8 @@ Import ('env') sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp') +# file already included in AUD_JOSResampleReader.cpp +sources.remove('AUD_JOSResampleReaderCoeff.cpp') incs = '. intern FX ' + env['BF_PTHREADS_INC'] defs = [] |