Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2006-02-04 17:15:10 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2006-02-04 17:15:10 +0300
commit3bb82a27fc61b787ab83145f9a7962c14e7ca769 (patch)
treeb1d432db0f2836f4117a71e341bc4fef34d62a5a /source/blender/SConscript
parent1db5c237165ac090af925d9cf8440fc953e4ee06 (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/SConscript')
-rw-r--r--source/blender/SConscript12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 926dc75e7ea..ba821355e23 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -1,5 +1,5 @@
#!/usr/bin/python
-Import ('user_options_dict')
+Import ('env')
SConscript(['avi/SConscript',
'blenkernel/SConscript',
@@ -16,11 +16,11 @@ SConscript(['avi/SConscript',
'src/SConscript',
'yafray/SConscript'])
-if user_options_dict['USE_OPENEXR'] == 1:
- SConscript (['imbuf/intern/openexr/SConscript'])
-
-if user_options_dict['USE_INTERNATIONAL'] == 1:
+if env['WITH_BF_FREETYPE'] == 1:
SConscript (['ftfont/SConscript'])
-if user_options_dict['USE_QUICKTIME'] == 1:
+if env['WITH_BF_OPENEXR'] == 1:
+ SConscript (['imbuf/intern/openexr/SConscript'])
+
+if env['WITH_BF_QUICKTIME'] == 1:
SConscript (['quicktime/SConscript'])