Commit: 30679179dd6af2fad61df0430951a37853aeb5b6 Author: Jörg Müller Date: Wed Jul 29 16:12:46 2015 +0200 Branches: master https://developer.blender.org/rB30679179dd6af2fad61df0430951a37853aeb5b6
Audaspace: fixes for building with Quicktime on Mac. =================================================================== M CMakeLists.txt M source/blender/makesrna/SConscript M source/blender/quicktime/CMakeLists.txt M source/blender/quicktime/SConscript M source/blender/quicktime/apple/qtkit_export.m =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 591942c..c2c0e8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -714,24 +714,29 @@ endif() if(WITH_AUDASPACE) if(WITH_SYSTEM_AUDASPACE) - add_definitions("-DAUD_DEVICE_H=<AUD_Device.h>") - add_definitions("-DAUD_SPECIAL_H=<AUD_Special.h>") - add_definitions("-DAUD_SOUND_H=<AUD_Sound.h>") - add_definitions("-DAUD_HANDLE_H=<AUD_Handle.h>") - add_definitions("-DAUD_SEQUENCE_H=<AUD_Sequence.h>") - add_definitions("-DAUD_TYPES_H=<AUD_Types.h>") - add_definitions("-DAUD_PYTHON_H=<python/PyAPI.h>") - set(AUDASPACE_DEFINITIONS -DWITH_AUDASPACE -DWITH_SYSTEM_AUDASPACE) + set(AUDASPACE_DEFINITIONS + -DWITH_AUDASPACE + -DWITH_SYSTEM_AUDASPACE + "-DAUD_DEVICE_H=<AUD_Device.h>" + "-DAUD_SPECIAL_H=<AUD_Special.h>" + "-DAUD_SOUND_H=<AUD_Sound.h>" + "-DAUD_HANDLE_H=<AUD_Handle.h>" + "-DAUD_SEQUENCE_H=<AUD_Sequence.h>" + "-DAUD_TYPES_H=<AUD_Types.h>" + "-DAUD_PYTHON_H=<python/PyAPI.h>" + ) else() - add_definitions("-DAUD_DEVICE_H=<AUD_C-API.h>") - add_definitions("-DAUD_SPECIAL_H=<AUD_C-API.h>") - add_definitions("-DAUD_SOUND_H=<AUD_C-API.h>") - add_definitions("-DAUD_HANDLE_H=<AUD_C-API.h>") - add_definitions("-DAUD_SEQUENCE_H=<AUD_C-API.h>") - add_definitions("-DAUD_TYPES_H=<AUD_Space.h>") set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern") set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern") - set(AUDASPACE_DEFINITIONS -DWITH_AUDASPACE) + set(AUDASPACE_DEFINITIONS + -DWITH_AUDASPACE + "-DAUD_DEVICE_H=<AUD_C-API.h>" + "-DAUD_SPECIAL_H=<AUD_C-API.h>" + "-DAUD_SOUND_H=<AUD_C-API.h>" + "-DAUD_HANDLE_H=<AUD_C-API.h>" + "-DAUD_SEQUENCE_H=<AUD_C-API.h>" + "-DAUD_TYPES_H=<AUD_Space.h>" + ) endif() endif() diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 4b05a0d..089fbe1 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -99,6 +99,10 @@ if env['WITH_BF_FFMPEG']: if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ../quicktime' + # Quicktime needs audaspace defines + if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index b0a8c92..f853c35 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 9b367a4..746662e 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 af66b0d..a4ee398 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" _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs