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/blender/windowmanager/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/blender/windowmanager/SConscript')
| -rw-r--r-- | source/blender/windowmanager/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 47eee41cf16..e05bc130c20 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -32,7 +32,6 @@ sources = env.Glob('intern/*.c') incs = [ '.', - '#/intern/audaspace/intern', '#/intern/ghost', '#/intern/guardedalloc', '#/intern/memutil', @@ -74,6 +73,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): if env['WITH_BF_IME']: defs.append('WITH_INPUT_IME') +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') |