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 --- source/blender/avi/SConscript | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'source/blender/avi') diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript index 56eaff26f0f..6c2faa5329d 100644 --- a/source/blender/avi/SConscript +++ b/source/blender/avi/SConscript @@ -1,22 +1,10 @@ #!/usr/bin/python -Import ('extra_includes') -Import ('user_options_dict') -Import ('library_env') +#Import ('extra_includes') +Import ('env') -avi_env = library_env.Copy () +sources = env.Glob('intern/*.c') -source_files = ['intern/avi.c', - 'intern/avirgb.c', - 'intern/codecs.c', - 'intern/endian.c', - 'intern/mjpeg.c', - 'intern/options.c', - 'intern/rgb32.c'] +incs = '. #/intern/guardedalloc' +incs += ' ' + env['BF_JPEG_INC'] -avi_env.Append (CPPPATH = ['.', - '../avi', - '#/intern/guardedalloc']) - -avi_env.Append (CPPPATH=user_options_dict['JPEG_INCLUDE']) -avi_env.Append (CPPPATH=extra_includes) -avi_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_avi', source=source_files) +env.BlenderLib ('blender_avi', sources, Split(incs), [], libtype='core', priority = 90 ) -- cgit v1.2.3