diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
| commit | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (patch) | |
| tree | 968418721b08baacd47bab95877bc08812f3046a /source/gameengine/Ketsji/SConscript | |
| parent | 7759782ee7c4e654641c9f7abb51631c86e3f29c (diff) | |
| parent | a3c5de3e3ca82d8ad5a28029f3ee9207929318a1 (diff) | |
Merge branch 'master' into UI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
Diffstat (limited to 'source/gameengine/Ketsji/SConscript')
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 8074a4064ff..5b2807d8172 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -40,8 +40,6 @@ incs = [ '#source/blender', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#intern/audaspace/FX', - '#intern/audaspace/intern', '#intern/moto/include', '#source/blender/blenfont', '#source/blender/blenkernel', @@ -86,6 +84,11 @@ if env['WITH_BF_PYTHON']: incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + incs += ' ' + env['BF_AUDASPACE_PY_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') |