diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-03 19:51:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-03 20:46:56 +0300 |
| commit | 627f27502f931c298dd42137c58be51b06a1de36 (patch) | |
| tree | 8ae38b14435068c7e9c29450432cf4aac5315871 /build_files | |
| parent | f96fd4430a74e79ac1536f5aff8748a8721cdb8f (diff) | |
Cycles: Support logging when building with SCons
Basically, title says ti all, the option is called WITH_BF_CYCLES_LOGGING
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/scons/tools/Blender.py | 4 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index afcc1d06436..d09710a28fc 100755 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -390,6 +390,10 @@ def creator(env): incs.append('#/extern/libmv') defs.append('WITH_LIBMV') + if env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']: + incs.append('#/intern/cycles/blender') + defs.append('WITH_CYCLES_LOGGING') + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 7857b7bb222..25f7f0fb3d1 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -197,7 +197,7 @@ def validate_arguments(args, bc): 'C_WARN', 'CC_WARN', 'CXX_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', 'MACOSX_ARCHITECTURE', 'MACOSX_SDK', 'XCODE_CUR_VER', 'C_COMPILER_ID', 'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET', - 'WITH_BF_CYCLES_DEBUG' + 'WITH_BF_CYCLES_DEBUG', 'WITH_BF_CYCLES_LOGGING' ] @@ -605,6 +605,7 @@ def read_opts(env, cfg, args): ('BF_CYCLES_CUDA_ENV', 'preset environement nvcc will execute in', ''), ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []), (BoolVariable('WITH_BF_CYCLES_DEBUG', 'Build Cycles engine with extra debugging capabilities', False)), + (BoolVariable('WITH_BF_CYCLES_LOGGING', 'Build Cycles engine with logging support', False)), (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)), (BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)), |