diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-04 17:15:10 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-04 17:15:10 +0300 |
commit | 3bb82a27fc61b787ab83145f9a7962c14e7ca769 (patch) | |
tree | b1d432db0f2836f4117a71e341bc4fef34d62a5a /source/blender/blenlib/SConscript | |
parent | 1db5c237165ac090af925d9cf8440fc953e4ee06 (diff) |
== 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
Diffstat (limited to 'source/blender/blenlib/SConscript')
-rw-r--r-- | source/blender/blenlib/SConscript | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index e6b50a4e2ff..99c48c74fb2 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -1,47 +1,15 @@ #!/usr/bin/python -Import ('extra_includes') -Import ('user_options_dict') -Import ('library_env') +Import ('env') -blenlib_env = library_env.Copy () +sources = env.Glob('intern/*.c') -source_files = ['intern/BLI_dynstr.c', - 'intern/BLI_ghash.c', - 'intern/edgehash.c', - 'intern/BLI_linklist.c', - 'intern/BLI_memarena.c', - 'intern/arithb.c', - 'intern/dynlib.c', - 'intern/fileops.c', - 'intern/gsqueue.c', - 'intern/matrixops.c', - 'intern/noise.c', - 'intern/psfont.c', - 'intern/rand.c', - 'intern/rct.c', - 'intern/scanfill.c', - 'intern/storage.c', - 'intern/time.c', - 'intern/util.c', - 'intern/vectorops.c', - 'intern/freetypefont.c', - 'intern/jitter.c', - 'intern/threads.c', - 'intern/winstuff.c'] +incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../include' +incs += ' ' + env['BF_FREETYPE_INC'] +incs += ' ' + env['BF_ZLIB_INC'] +incs += ' ' + env['BF_SDL_INC'] +defs = '' +if env['WITH_BF_FREETYPE'] == 1: + defs = 'WITH_FREETYPE2' -blenlib_env.Append (CPPPATH = ['.', - '../blenlib', - '../makesdna', - '../blenkernel', - '#/intern/guardedalloc', - '../include']) - -if user_options_dict['USE_INTERNATIONAL'] == 1: - blenlib_env.Append (CPPDEFINES = 'WITH_FREETYPE2') - -blenlib_env.Append (CPPPATH = extra_includes) -blenlib_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE']) -blenlib_env.Append (CPPPATH = user_options_dict['Z_INCLUDE']) -blenlib_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) -blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files) +env.BlenderLib ( 'blender_blenlib', sources, Split(incs), Split(defs), libtype='core', priority = 85 ) |