From 15da2232f7aa0f11a89e48f41f5730ddc8bb1b10 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 8 Jan 2008 09:47:44 +0000 Subject: * tweak linking priorities - should help for GCC users * some lib renaming --- intern/SoundSystem/SConscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'intern/SoundSystem') diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index a9c1110c09a..97a34326008 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -7,10 +7,10 @@ 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'] else: - defs = 'NO_SOUND' + defs = 'NO_SOUND' -env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] ) +env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [30,135] ) -- cgit v1.2.3