diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-08 22:37:24 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-08 22:37:24 +0400 |
| commit | 4565944248175e84a2b3663202cae0c86fcee5b9 (patch) | |
| tree | 708c4f90fd8910217a366371d04b027f8d2436d3 /tools | |
| parent | 98b18bc679388a2c036c9fed48a835ac71963b7f (diff) | |
| parent | de4828036857e76141ca336997b99978ee09fb5f (diff) | |
soc-2008-mxcurioni: merged changes to revision 16424, corrected compilation errors
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/btools.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/btools.py b/tools/btools.py index f8f9eacd6b1..ffdf90d5c49 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -51,7 +51,6 @@ def validate_arguments(args, bc): 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS', 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', 'WITH_BF_PLAYER', - 'WITH_BF_GLEXT', 'WITH_BF_BINRELOC', 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', @@ -296,7 +295,6 @@ def read_opts(cfg, args): ('BF_FTGL_INC', 'FTGL include path', ''), ('BF_FTGL_LIB', 'FTGL libraries', ''), - (BoolOption('WITH_BF_GLEXT', 'Enable GL Extensions', 'true')), (BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')), ('CFLAGS', 'C-compiler flags', ''), @@ -336,6 +334,8 @@ def read_opts(cfg, args): ('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), + + ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'), ) # end of opts.AddOptions() |