Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/quicktime')
-rw-r--r--source/blender/quicktime/CMakeLists.txt10
-rw-r--r--source/blender/quicktime/apple/qtkit_export.m4
2 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt
index 3b70cf19a7f..6ce4954f053 100644
--- a/source/blender/quicktime/CMakeLists.txt
+++ b/source/blender/quicktime/CMakeLists.txt
@@ -38,12 +38,11 @@ set(INC
../render/extern/include
../include
../windowmanager
- ../../../intern/audaspace/intern
../../../intern/guardedalloc
)
set(INC_SYS
- ${QUICKTIME_INC}
+ ${QUICKTIME_INCLUDE_DIRS}
)
if(USE_QTKIT)
@@ -66,4 +65,11 @@ endif()
add_definitions(-DWITH_QUICKTIME)
+if(WITH_AUDASPACE)
+ list(APPEND INC
+ ../../../intern/audaspace/intern
+ )
+ add_definitions(-DWITH_AUDASPACE)
+endif()
+
blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m
index add280c6b64..c1b8688e1d7 100644
--- a/source/blender/quicktime/apple/qtkit_export.m
+++ b/source/blender/quicktime/apple/qtkit_export.m
@@ -38,7 +38,9 @@
#include "DNA_scene_types.h"
#include "DNA_userdef_types.h"
-#include "AUD_C-API.h"
+#ifdef WITH_AUDASPACE
+# include "AUD_C-API.h"
+#endif
#include "BKE_global.h"
#include "BKE_main.h"