diff options
| author | Jörg Müller <nexyon@gmail.com> | 2015-07-29 17:12:46 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2015-07-29 17:13:22 +0300 |
| commit | 30679179dd6af2fad61df0430951a37853aeb5b6 (patch) | |
| tree | bf6cfb609fd7a6fc2d08817543f10aee4f145125 /source/blender/quicktime | |
| parent | a3b86611a8182a95c5ed2205b0b71bfcc8f0837b (diff) | |
Audaspace: fixes for building with Quicktime on Mac.
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 7 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index b0a8c92e559..f853c35457f 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -52,10 +52,11 @@ set(SRC add_definitions(-DWITH_QUICKTIME) 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() blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 9b367a434f2..746662ebf3e 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -44,8 +44,7 @@ incs = ['.', '../imbuf', '../imbuf/intern', '../render/extern/include', - '../editors/include', - '#/intern/audaspace/intern'] + '../editors/include'] incs.append(env['BF_QUICKTIME_INC']) @@ -54,6 +53,10 @@ priorities = [200,235] defs=['WITH_QUICKTIME'] +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs.append(env['BF_AUDASPACE_C_INC']) + if env['C_COMPILER_ID'] == 'gcc' and env['CCVERSION'] >= '4.6': # always use default-Apple-gcc for objC language, gnu-compilers do not support it fully yet env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') else: diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index af66b0db266..a4ee398da5d 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -35,7 +35,7 @@ #include "DNA_userdef_types.h" #ifdef WITH_AUDASPACE -# include "AUD_C-API.h" +# include AUD_DEVICE_H #endif #include "BLI_utildefines.h" |