diff options
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sound/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/blender/editors/sound/sound_ops.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 6 |
6 files changed, 36 insertions, 12 deletions
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 245ee657bc3..c3ef0f8851f 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -39,10 +39,14 @@ set(SRC ) if(WITH_AUDASPACE) - list(APPEND INC - ../../../../intern/audaspace/intern - ) add_definitions(-DWITH_AUDASPACE) + + if(WITH_EXTERNAL_AUDASPACE) + add_definitions(-DWITH_EXTERNAL_AUDASPACE) + list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) + else() + list(APPEND INC ../../../../intern/audaspace/intern) + endif() endif() if(WITH_CODEC_FFMPEG) diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 8a3b48125d0..1fd48dd7e00 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -67,7 +67,11 @@ #include "WM_types.h" #ifdef WITH_AUDASPACE -# include "AUD_C-API.h" +# ifdef WITH_EXTERNAL_AUDASPACE +# include <audaspace/AUD_Special.h> +# else +# include "AUD_C-API.h" +# endif #endif #include "ED_sound.h" diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 0a29810ff3d..b911f9effbe 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -48,10 +48,14 @@ set(SRC ) if(WITH_AUDASPACE) - list(APPEND INC - ../../../../intern/audaspace/intern - ) add_definitions(-DWITH_AUDASPACE) + + if(WITH_EXTERNAL_AUDASPACE) + add_definitions(-DWITH_EXTERNAL_AUDASPACE) + list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) + else() + list(APPEND INC ../../../../intern/audaspace/intern) + endif() endif() if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 3de3ecebc44..1f2b02dcf31 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -36,7 +36,11 @@ #include <float.h> #ifdef WITH_AUDASPACE -# include "AUD_C-API.h" +# ifdef WITH_EXTERNAL_AUDASPACE +# include <audaspace/AUD_Special.h> +# else +# include "AUD_C-API.h" +# endif #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index d9aff2781f0..ea12ee3b751 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -53,10 +53,14 @@ set(SRC ) if(WITH_AUDASPACE) - list(APPEND INC - ../../../../intern/audaspace/intern - ) add_definitions(-DWITH_AUDASPACE) + + if(WITH_EXTERNAL_AUDASPACE) + add_definitions(-DWITH_EXTERNAL_AUDASPACE) + list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) + else() + list(APPEND INC ../../../../intern/audaspace/intern) + endif() endif() if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index edf8a41b5a8..7ffed70d7b8 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -66,7 +66,11 @@ #include "BKE_sound.h" #ifdef WITH_AUDASPACE -# include "AUD_C-API.h" +# ifdef WITH_EXTERNAL_AUDASPACE +# include <audaspace/AUD_Sequence.h> +# else +# include "AUD_C-API.h" +# endif #endif /* own include */ |