diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-07 10:44:33 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-07 10:44:33 +0400 |
| commit | eeb95280be1eb2845266e4e4dc8ef1d4905154b8 (patch) | |
| tree | b242c4629c91a1a9d15d8421a8a130be075af199 /build_files/scons/tools | |
| parent | 36cc2fd6da09c75a28b8c9d4871d513caaf2ac69 (diff) | |
Missing build_files updates in the merger in revision 55847.
Diffstat (limited to 'build_files/scons/tools')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 37db10bbe5b..816287cdc73 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -388,7 +388,7 @@ def creator(env): defs.append('WITH_PYTHON') if env['BF_DEBUG']: defs.append('_DEBUG') - + if env['WITH_BF_FREESTYLE']: incs.append('#/source/blender/freestyle') defs.append('WITH_FREESTYLE') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 885c8f3d4c4..8db39833451 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -252,7 +252,6 @@ def read_opts(env, cfg, args): localopts.AddVariables( ('LCGDIR', 'Location of SVN lib dir'), ('LIBDIR', 'Root dir of libs'), - (BoolVariable('WITH_BF_FREESTYLE', 'Compile with freestyle', True)), (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)), (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)), ('BF_PYTHON', 'Base path for python', ''), @@ -392,6 +391,8 @@ def read_opts(env, cfg, args): ('BF_ICONV_LIB', 'iconv library', ''), ('BF_ICONV_LIBPATH', 'iconv library path', ''), + (BoolVariable('WITH_BF_FREESTYLE', 'Compile with freestyle', True)), + (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)), (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)), |