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/ftfont/SConscript | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'source/blender/ftfont') diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index 50cd37d6526..9d9da82fac2 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -1,23 +1,15 @@ #!/usr/bin/python -Import ('extra_includes') -Import ('user_options_dict') -Import ('library_env') +import sys +Import ('env') -ftf_env = library_env.Copy () +sources = env.Glob('intern/*.cpp') -source_files = ['intern/FTF_Api.cpp', - 'intern/FTF_TTFont.cpp'] - -include_paths = ['.', - 'intern', - '../blenkernel', - '../blenlib', - '../makesdna'] +incs = '. intern ../blenkernel ../blenlib ../makesdna' +incs += ' ' + env['BF_FTGL_INC'] +incs += ' ' + env['BF_FREETYPE_INC'] +incs += ' ' + env['BF_GETTEXT_INC'] -ftf_env.Append(CPPPATH = extra_includes) -ftf_env.Append(CPPPATH = include_paths) -ftf_env.Prepend (CPPPATH = user_options_dict['FTGL_INCLUDE']) -ftf_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE']) -ftf_env.Prepend (CPPPATH = user_options_dict['GETTEXT_INCLUDE']) -ftf_env.Append(CPPDEFINES = 'FTGL_STATIC_LIBRARY') -ftf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_FTF', source=source_files) +defs = 'FTGL_STATIC_LIBRARY' +if sys.platform == 'win32': + defs += ' _WIN32 USE_GETTEXT_DLL' +env.BlenderLib ( 'blender_FTF', sources, Split(incs), Split(defs), libtype='international', priority=0 ) -- cgit v1.2.3