diff options
| author | Jörg Müller <nexyon@gmail.com> | 2015-06-16 11:03:35 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:53 +0300 |
| commit | a0cbebf404d6c46e59b090e7217ce39d7e760809 (patch) | |
| tree | fad66bb8f714c160c3a3f016e1fba1711824e34d /source/gameengine/BlenderRoutines/SConscript | |
| parent | 58956f3b91e581ef7040371dda3e3595902c18d9 (diff) | |
Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.
- rename WITH_EXTERNAL_AUDASPACE to WITH_SYSTEM_AUDASPACE.
- rename C/PYAUDASPACE to AUDASPACE_C/PY
- simplifying cmake defines and includes.
- fixing include paths and enabling WITH_SYSTEM_AUDASPACE for windows.
- fixing scons building.
- other minor build system fixes.
Diffstat (limited to 'source/gameengine/BlenderRoutines/SConscript')
| -rw-r--r-- | source/gameengine/BlenderRoutines/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index def0bc32697..9bce7b78bf4 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -39,7 +39,6 @@ incs = [ '#source/blender', env['BF_GLEW_INC'], '#/intern/glew-mx', - '#intern/audaspace/intern', '#intern/ghost/include', '#intern/moto/include', '#source/blender/blenfont', @@ -67,6 +66,10 @@ incs = [ ] incs = ' '.join(incs) +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') |