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/writeffmpeg.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/writeffmpeg.c')
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index eb07a2d370b..8969d6694ff 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -45,12 +45,8 @@ #include "BLI_blenlib.h" #ifdef WITH_AUDASPACE -# ifdef WITH_EXTERNAL_AUDASPACE -# include <audaspace/AUD_Device.h> -# include <audaspace/AUD_Special.h> -# else -# include "AUD_C-API.h" -# endif +# include AUD_DEVICE_H +# include AUD_SPECIAL_H #endif #include "BLI_utildefines.h" |