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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index f706645896b..ea3d840aaed 100644 --- a/SConstruct +++ b/SConstruct @@ -540,13 +540,25 @@ else: env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__') # TODO, make optional (as with CMake) -env['CPPFLAGS'].append('-DWITH_AUDASPACE') env['CPPFLAGS'].append('-DWITH_AVI') env['CPPFLAGS'].append('-DWITH_OPENNL') if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'): env['CPPFLAGS'].append('-DHAVE_STDBOOL_H') +# Audaspace + +if env['WITH_BF_AUDASPACE']: + env['BF_AUDASPACE_C_INC'] = '#intern/audaspace/intern' + env['BF_AUDASPACE_PY_INC'] = '#intern/audaspace/intern' + env['BF_AUDASPACE_DEF'] = ['WITH_AUDASPACE'] + env['BF_AUDASPACE_DEF'].append('AUD_DEVICE_H="<AUD_C-API.h>"') + env['BF_AUDASPACE_DEF'].append('AUD_SPECIAL_H="<AUD_C-API.h>"') + env['BF_AUDASPACE_DEF'].append('AUD_SOUND_H="<AUD_C-API.h>"') + env['BF_AUDASPACE_DEF'].append('AUD_HANDLE_H="<AUD_C-API.h>"') + env['BF_AUDASPACE_DEF'].append('AUD_SEQUENCE_H="<AUD_C-API.h>"') + env['BF_AUDASPACE_DEF'].append('AUD_TYPES_H="<AUD_Space.h>"') + # OpenGL if env['WITH_BF_GL_PROFILE_COMPAT']: |