diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
| commit | 5ef9039b7e2ea16bd4b651aab21d5aa690485569 (patch) | |
| tree | e67247fa43d89748900b697eb9bdf0341fe53afc /build_files | |
| parent | fb56dbc2afc7c8b6ffc24406ed82cbcbff090da3 (diff) | |
| parent | 5ebee683bd736ef80df939552bbe0d8e104b56df (diff) | |
Cycles: svn merge -r41531:41613 ^/trunk/blender
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 4 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 44f9a4c8062..ba15f1c1c09 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -329,6 +329,10 @@ def creator(env): if env['WITH_BF_SDL']: defs.append('WITH_SDL') + if env['WITH_BF_LIBMV']: + incs.append('#/extern/libmv') + defs.append('WITH_LIBMV') + if env['WITH_BF_PYTHON']: incs.append('#/source/blender/python') defs.append('WITH_PYTHON') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 68054fe485e..5c78dc646bb 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -515,6 +515,8 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)), (BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)), + (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)), + ('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), # (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)), |