From 3bb82a27fc61b787ab83145f9a7962c14e7ca769 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sat, 4 Feb 2006 14:15:10 +0000 Subject: == SCons == * This commit is all of the rewrite work done on the SCons system. For documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt. Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring contains valuable information, along with what still needs to be done. - linux, os x and windows compile now. - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py) - NOTE: Jean-Luc P will commit sometime during the weekend proper appit() for OS X. For now, copy the resulting binary to an existing .app bundle. - features: - cleaner structure for better maintenance - cleaner output during compile - better handling of build options - general overall speed increase - see the wiki for more info Cygwin, FreeBSD and Solaris systems still need work. For these systems: 1) copy a config/(platform)-config.py to ie. config/cygwin-config.py 2) set the proper defaults for your platform 3) mail me at jesterking at letwory dot net with you configuration. if you need any modifications to the system, do send a patch, too. I'll be giving first-aid today and tomorrow, after that it'll be all regular development work :) /Nathan --- intern/SoundSystem/SConscript | 52 +++++++++---------------------------------- 1 file changed, 11 insertions(+), 41 deletions(-) (limited to 'intern/SoundSystem') diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index 0ff757b54a7..d06b28e7c2d 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -1,47 +1,17 @@ #!/usr/bin/python -import sys -Import ('user_options_dict') -Import ('extra_includes') -Import ('library_env') +Import ('env') -soundsys_env = library_env.Copy () +sources = env.Glob('dummy/*.cpp') + env.Glob('intern/*.cpp') -source_files = ['dummy/SND_DummyDevice.cpp', - 'intern/SND_AudioDevice.cpp', - 'intern/SND_C-api.cpp', - 'intern/SND_CDObject.cpp', - 'intern/SND_DeviceManager.cpp', - 'intern/SND_IdObject.cpp', - 'intern/SND_Scene.cpp', - 'intern/SND_SoundListener.cpp', - 'intern/SND_SoundObject.cpp', - 'intern/SND_Utils.cpp', - 'intern/SND_WaveCache.cpp', - 'intern/SND_WaveSlot.cpp'] +incs = '. intern ../moto/include ../string dummy openal sdl' +defs = '' +if env['WITH_BF_OPENAL'] == 1: + sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp') + incs += ' ' + env['BF_OPENAL_INC'] + incs += ' ' + env['BF_SDL_INC'] -soundsys_env.Append (CPPPATH = ['.', - '../SoundSystem', - 'intern', - '../moto/include', - '../string', - 'dummy', - 'openal', - 'sdl']) +if env['WITH_BF_OPENAL'] == 0: + defs = 'NO_SOUND' -if user_options_dict['USE_OPENAL'] == 1: - source_files += ['openal/SND_OpenALDevice.cpp', - 'openal/pthread_cancel.cpp', - 'sdl/SND_SDLCDDevice.cpp'] - soundsys_env.Append (CPPPATH=user_options_dict['OPENAL_INCLUDE']) - soundsys_env.Append (CPPPATH=user_options_dict['SDL_INCLUDE']) - -if user_options_dict['USE_FMOD'] == 1: - source_files += ['fmod/SND_FmodDevice.cpp'] - -if user_options_dict['USE_OPENAL'] == 0 and user_options_dict['USE_FMOD'] == 0: - soundsys_env.Append (CPPDEFINES = 'NO_SOUND') - -soundsys_env.Append (CPPPATH = extra_includes) - -soundsys_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/soundsystem', source=source_files) +env.BlenderLib ('blender_sndsys', sources, Split(incs), Split(defs), libtype=['core','player2'], priority = [20,10] ) -- cgit v1.2.3