diff options
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/windowmanager/SConscript | 5 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 9 |
3 files changed, 14 insertions, 7 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 4014d370eb8..5328e62367b 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -80,10 +80,11 @@ set(SRC ) if(WITH_AUDASPACE) - list(APPEND INC - ../../../intern/audaspace/intern + add_definitions(${AUDASPACE_DEFINITIONS}) + + list(APPEND INC_SYS + ${AUDASPACE_C_INCLUDE_DIRS} ) - add_definitions(-DWITH_AUDASPACE) endif() add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 47eee41cf16..e05bc130c20 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -32,7 +32,6 @@ sources = env.Glob('intern/*.c') incs = [ '.', - '#/intern/audaspace/intern', '#/intern/ghost', '#/intern/guardedalloc', '#/intern/memutil', @@ -74,6 +73,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): if env['WITH_BF_IME']: defs.append('WITH_INPUT_IME') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 3173e0180fa..e63b4661870 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -72,7 +72,10 @@ #include "WM_api.h" /* only for WM_main_playanim */ #ifdef WITH_AUDASPACE -#include "AUD_C-API.h" +# include AUD_DEVICE_H +# include AUD_HANDLE_H +# include AUD_SOUND_H +# include AUD_SPECIAL_H AUD_Sound *source = NULL; AUD_Handle *playback_handle = NULL; @@ -1107,8 +1110,8 @@ static char *wm_main_playanim_intern(int argc, const char **argv) AUD_initOnce(); - if (!(audio_device = AUD_init("OpenAL", specs, AUD_DEFAULT_BUFFER_SIZE, "Blender"))) - audio_device = AUD_init("Null", specs, AUD_DEFAULT_BUFFER_SIZE, "Blender"); + if (!(audio_device = AUD_init("OpenAL", specs, 1024, "Blender"))) + audio_device = AUD_init("Null", specs, 0, "Blender"); #endif |