Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Audaspace: fixes for building with Quicktime on Mac.

Browse Source
This commit is contained in:
Jörg Müller
2015-07-29 16:12:46 +02:00
parent a3b86611a8
commit 30679179dd
5 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@@ -714,24 +714,29 @@ endif()
if(WITH_AUDASPACE) if(WITH_AUDASPACE)
if(WITH_SYSTEM_AUDASPACE) if(WITH_SYSTEM_AUDASPACE)
add_definitions("-DAUD_DEVICE_H=<AUD_Device.h>") set(AUDASPACE_DEFINITIONS
add_definitions("-DAUD_SPECIAL_H=<AUD_Special.h>") -DWITH_AUDASPACE
add_definitions("-DAUD_SOUND_H=<AUD_Sound.h>") -DWITH_SYSTEM_AUDASPACE
add_definitions("-DAUD_HANDLE_H=<AUD_Handle.h>") "-DAUD_DEVICE_H=<AUD_Device.h>"
add_definitions("-DAUD_SEQUENCE_H=<AUD_Sequence.h>") "-DAUD_SPECIAL_H=<AUD_Special.h>"
add_definitions("-DAUD_TYPES_H=<AUD_Types.h>") "-DAUD_SOUND_H=<AUD_Sound.h>"
add_definitions("-DAUD_PYTHON_H=<python/PyAPI.h>") "-DAUD_HANDLE_H=<AUD_Handle.h>"
set(AUDASPACE_DEFINITIONS -DWITH_AUDASPACE -DWITH_SYSTEM_AUDASPACE) "-DAUD_SEQUENCE_H=<AUD_Sequence.h>"
"-DAUD_TYPES_H=<AUD_Types.h>"
"-DAUD_PYTHON_H=<python/PyAPI.h>"
)
else() 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_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
set(AUDASPACE_PY_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()
endif() endif()

4
source/blender/makesrna/SConscript
View File

@@ -99,6 +99,10 @@ if env['WITH_BF_FFMPEG']:
if env['WITH_BF_QUICKTIME']: if env['WITH_BF_QUICKTIME']:
defs.append('WITH_QUICKTIME') defs.append('WITH_QUICKTIME')
incs += ' ../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']: if env['WITH_BF_GAMEENGINE']:
defs.append('WITH_GAMEENGINE') defs.append('WITH_GAMEENGINE')

7
source/blender/quicktime/CMakeLists.txt
View File

@@ -52,10 +52,11 @@ set(SRC
add_definitions(-DWITH_QUICKTIME) add_definitions(-DWITH_QUICKTIME)
if(WITH_AUDASPACE) if(WITH_AUDASPACE)
list(APPEND INC add_definitions(${AUDASPACE_DEFINITIONS})
../../../intern/audaspace/intern
list(APPEND INC_SYS
${AUDASPACE_C_INCLUDE_DIRS}
) )
add_definitions(-DWITH_AUDASPACE)
endif() endif()
blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}") blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}")

7
source/blender/quicktime/SConscript
View File

@@ -44,8 +44,7 @@ incs = ['.',
'../imbuf', '../imbuf',
'../imbuf/intern', '../imbuf/intern',
'../render/extern/include', '../render/extern/include',
'../editors/include', '../editors/include']
'#/intern/audaspace/intern']
incs.append(env['BF_QUICKTIME_INC']) incs.append(env['BF_QUICKTIME_INC'])
@@ -54,6 +53,10 @@ priorities = [200,235]
defs=['WITH_QUICKTIME'] 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 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++') 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: else:

2
source/blender/quicktime/apple/qtkit_export.m
View File

@@ -35,7 +35,7 @@
#include "DNA_userdef_types.h" #include "DNA_userdef_types.h"
#ifdef WITH_AUDASPACE #ifdef WITH_AUDASPACE
# include "AUD_C-API.h" # include AUD_DEVICE_H
#endif #endif
#include "BLI_utildefines.h" #include "BLI_utildefines.h"