diff options
| author | Jörg Müller <nexyon@gmail.com> | 2015-06-16 11:03:35 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:53 +0300 |
| commit | a0cbebf404d6c46e59b090e7217ce39d7e760809 (patch) | |
| tree | fad66bb8f714c160c3a3f016e1fba1711824e34d /source/blender/editors/sound | |
| parent | 58956f3b91e581ef7040371dda3e3595902c18d9 (diff) | |
Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.
- rename WITH_EXTERNAL_AUDASPACE to WITH_SYSTEM_AUDASPACE.
- rename C/PYAUDASPACE to AUDASPACE_C/PY
- simplifying cmake defines and includes.
- fixing include paths and enabling WITH_SYSTEM_AUDASPACE for windows.
- fixing scons building.
- other minor build system fixes.
Diffstat (limited to 'source/blender/editors/sound')
| -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 |
3 files changed, 10 insertions, 14 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" |