diff options
author | Jörg Müller <nexyon@gmail.com> | 2014-03-04 16:44:15 +0400 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:52 +0300 |
commit | 733073550f61cf4fbbe21aab33e9271915325109 (patch) | |
tree | a182ced91bb592815c097abf572bba999a9e8cdc /source/blender/makesrna | |
parent | 96dd213e7ecabeffc682aee40b4102296ab062de (diff) |
Audaspace: use standalone library.
- Added the cmake configuration option WITH_EXTERNAL_AUDASPACE.
- Fixes to build without standalone library as well.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index bef2fa3084e..967ec3aeaf8 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -225,6 +225,13 @@ endif() 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() endif() if(WITH_CODEC_QUICKTIME) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e990ff1ec29..9c4fcd927c8 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -59,7 +59,11 @@ #ifdef WITH_QUICKTIME # include "quicktime_export.h" # ifdef WITH_AUDASPACE -# include "AUD_Space.h" +# ifdef WITH_EXTERNAL_AUDASPACE +# include <audaspace/AUD_Types.h> +# else +# include "AUD_Space.h" +# endif # endif #endif |