diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-23 21:30:56 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-23 21:30:56 +0400 |
| commit | 413bc87e4f18bb46eeb2f2f52b5278d182b51de8 (patch) | |
| tree | 6d67ac820f672bd132ebb628381b0a793403ff7c /source/blender/editors/space_sequencer | |
| parent | cc246eaca7bc385738658672e66a5bca8872d5a1 (diff) | |
| parent | e7c6b535b0140876ef1b5650c7b259093f07c4b3 (diff) | |
Merge with trunk r37757.
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index d5f36719471..71a4cfca868 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -29,7 +29,6 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc - ../../../../intern/audaspace/intern ) set(INC_SYS @@ -49,4 +48,11 @@ set(SRC sequencer_intern.h ) +if(WITH_AUDASPACE) + list(APPEND INC + ../../../../intern/audaspace/intern + ) + add_definitions(-DWITH_AUDASPACE) +endif() + blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 067d63b3b6c..f6e3dc3dd0a 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -70,7 +70,10 @@ #include "UI_view2d.h" #include "BKE_sound.h" -#include "AUD_C-API.h" + +#ifdef WITH_AUDASPACE +# include "AUD_C-API.h" +#endif /* own include */ #include "sequencer_intern.h" |