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/blenkernel/intern/sound.c | |
| 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/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index db92e0ed3c9..b81839f80fb 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -48,14 +48,12 @@ #include "DNA_speaker_types.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Sound.h> -# include <audaspace/AUD_Sequence.h> -# include <audaspace/AUD_Handle.h> -# include <audaspace/AUD_Special.h> -# include "AUD_Set.h" -# else -# include "AUD_C-API.h" +# include AUD_SOUND_H +# include AUD_SEQUENCE_H +# include AUD_HANDLE_H +# include AUD_SPECIAL_H +# ifdef WITH_SYSTEM_AUDASPACE +# include "../../../intern/audaspace/intern/AUD_Set.h" # endif #endif @@ -845,7 +843,7 @@ float BKE_sound_get_length(bSound *sound) bool BKE_sound_is_jack_supported(void) { -#ifdef WITH_EXTERNAL_AUDASPACE +#ifdef WITH_SYSTEM_AUDASPACE return 1; #else return (bool)AUD_isJackSupported(); |