diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 15:25:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 15:25:34 +0400 |
commit | 957976882d084d9951760b154f414724d6ddb8be (patch) | |
tree | 9b81d50c17b64575949351ea1c733e90f6b118ae /build_files/scons | |
parent | 940d1dcd0a9f88ec5a7b1ec0cf12dc7a6ddddf0b (diff) |
build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
Diffstat (limited to 'build_files/scons')
-rw-r--r-- | build_files/scons/tools/btools.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 93f3795b916..c930c150cb6 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -36,7 +36,7 @@ def validate_arguments(args, bc): 'WITH_BF_SNDFILE', 'BF_SNDFILE', 'BF_SNDFILE_INC', 'BF_SNDFILE_LIB', 'BF_SNDFILE_LIBPATH', 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', - 'WITH_BF_DDS', + 'WITH_BF_DDS', 'WITH_BF_CINEON', 'WITH_BF_HDR', 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', @@ -223,7 +223,11 @@ def read_opts(env, cfg, args): ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''), - (BoolVariable('WITH_BF_DDS', 'Use DDS if true', True)), + (BoolVariable('WITH_BF_DDS', 'Support DDS image format if true', True)), + + (BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)), + + (BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)), (BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)), ('BF_FFMPEG', 'FFMPEG base path', ''), |