diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-03-07 00:01:55 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-03-07 00:01:55 +0300 |
| commit | 3796abf092c9de4d43131dbce05102b126e14896 (patch) | |
| tree | 7893ba6005950e1770ab72b86b615a69f6f3ef56 /intern | |
| parent | e179b3d98e4d26636d5f6becafa3a2129cc04fea (diff) | |
* on win32 with msvc USE_OPENAL was defined for the entire source. Made it so that it is defined only there where needed when needed.
* dxguid is necessary only when building WITH_BF_OPENAL=1. I already added the mingw version to our SVN in lib/windows/openal/lib and now I made sure it is linked against only when needed.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/SoundSystem/SConscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index a9c1110c09a..baf680f03f0 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -7,10 +7,11 @@ sources = env.Glob('dummy/*.cpp') + env.Glob('intern/*.cpp') incs = '. intern ../moto/include ../string dummy openal sdl' defs = '' if env['WITH_BF_OPENAL']: - sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp') - incs += ' ' + env['BF_OPENAL_INC'] - incs += ' ' + env['BF_SDL_INC'] + sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp') + incs += ' ' + env['BF_OPENAL_INC'] + incs += ' ' + env['BF_SDL_INC'] + defs = 'USE_OPENAL' else: - defs = 'NO_SOUND' + defs = 'NO_SOUND' env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] ) |