diff options
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/SConscript | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 8 |
4 files changed, 9 insertions, 17 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 52c01f6d476..4b05a0db358 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -40,7 +40,6 @@ incs = [ '#/intern/memutil', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '#/intern/cycles/blender', '#/intern/smoke/extern', '../blenfont', diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 36e0a49c01d..3ebce1a7af0 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -224,14 +224,11 @@ if(WITH_IMAGE_FRAMESERVER) endif() 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_CODEC_QUICKTIME) @@ -332,7 +329,6 @@ blender_include_dirs( ../../windowmanager ../../editors/include ../../render/extern/include - ../../../../intern/audaspace/intern ../../../../intern/cycles/blender ../../../../intern/guardedalloc ../../../../intern/glew-mx diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 0e36a4c9712..0a9f9eec08c 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -59,7 +59,6 @@ incs = [ '#/intern/guardedalloc', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#/intern/audaspace/intern', '#/intern/cycles/blender', '#/intern/smoke/extern', '../../blenfont', @@ -110,6 +109,10 @@ if env['WITH_BF_HDR']: if env['WITH_BF_FRAMESERVER']: defs.append('WITH_FRAMESERVER') +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') incs += ' ' + env['BF_FFMPEG_INC'] + ' #/intern/ffmpeg' diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 9c4fcd927c8..db00f149758 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -58,13 +58,7 @@ #ifdef WITH_QUICKTIME # include "quicktime_export.h" -# ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Types.h> -# else -# include "AUD_Space.h" -# endif -# endif +# include AUD_TYPES_H #endif #ifdef WITH_FFMPEG |