diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/sound/CMakeLists.txt | 13 | ||||
-rw-r--r-- | source/blender/editors/sound/SConscript | 5 | ||||
-rw-r--r-- | source/blender/editors/sound/sound_ops.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_graph/CMakeLists.txt | 11 | ||||
-rw-r--r-- | source/blender/editors/space_graph/SConscript | 5 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/CMakeLists.txt | 11 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/SConscript | 5 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 6 |
9 files changed, 28 insertions, 40 deletions
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index c3ef0f8851f..535cd579030 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -39,14 +39,11 @@ set(SRC ) if(WITH_AUDASPACE) - 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() + add_definitions(${AUDASPACE_DEFINITIONS}) + + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_CODEC_FFMPEG) diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index 33feedf51cc..fad52c64df1 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -31,7 +31,6 @@ sources = env.Glob('*.c') incs = [ '#/intern/guardedalloc', - '#/intern/audaspace/intern', '../include', '../../blenkernel', '../../blenlib', @@ -44,6 +43,10 @@ incs = ' '.join(incs) defs = [] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 1fd48dd7e00..c081539df41 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -67,11 +67,7 @@ #include "WM_types.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Special.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SPECIAL_H #endif #include "ED_sound.h" diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index b911f9effbe..b692f0b1c12 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -48,14 +48,11 @@ set(SRC ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../../intern/audaspace/intern) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript index 35e09749743..ac23e8ee4e7 100644 --- a/source/blender/editors/space_graph/SConscript +++ b/source/blender/editors/space_graph/SConscript @@ -33,7 +33,6 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '../include', '../../blenfont', '../../blenkernel', @@ -47,6 +46,10 @@ incs = [ defs = env['BF_GL_DEFINITIONS'] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs.append(env['BF_AUDASPACE_C_INC']) + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 1f2b02dcf31..cc18df92cb1 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -36,11 +36,7 @@ #include <float.h> #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Special.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SPECIAL_H #endif #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index ea12ee3b751..03d81019997 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -53,14 +53,11 @@ set(SRC ) if(WITH_AUDASPACE) - add_definitions(-DWITH_AUDASPACE) + add_definitions(${AUDASPACE_DEFINITIONS}) - if(WITH_EXTERNAL_AUDASPACE) - add_definitions(-DWITH_EXTERNAL_AUDASPACE) - list(APPEND INC_SYS ${CAUDASPACE_INCLUDE_DIRS}) - else() - list(APPEND INC ../../../../intern/audaspace/intern) - endif() + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} + ) endif() if(WITH_INTERNATIONAL) diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 954f8abff69..8ec1cddce10 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -33,7 +33,6 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '../include', '../../blenfont', '../../blenkernel', @@ -47,6 +46,10 @@ incs = [ defs = env['BF_GL_DEFINITIONS'] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs.append(env['BF_AUDASPACE_C_INC']) + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs.append(env['BF_PTHREADS_INC']) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 7ffed70d7b8..2039358b772 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -66,11 +66,7 @@ #include "BKE_sound.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Sequence.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_SEQUENCE_H #endif /* own include */ |