diff options
| author | Andrea Weikert <elubie@gmx.net> | 2010-07-04 19:35:23 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2010-07-04 19:35:23 +0400 |
| commit | ca81aa704e958a73a55e79654f70eaa9a0fad85a (patch) | |
| tree | 8b40e3a7613df4e707fcc8efb3a099f9445ac350 /tools | |
| parent | 3ca7b160a664e74c6815056a4a8596bb4c2b70be (diff) | |
Patch [#22339] File/installation paths changes
Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127
This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal
Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert
NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.
Commit discussed on IRC with Ton and Campbell.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 2 | ||||
| -rw-r--r-- | tools/btools.py | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 6356210b113..cd6e4652754 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -145,6 +145,8 @@ def setup_staticlibs(lenv): libincs += Split(lenv['BF_OPENEXR_LIBPATH']) if lenv['WITH_BF_STATICOPENEXR']: statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) + if lenv['WITH_BF_LCMS']: + libincs += Split(lenv['BF_LCMS_LIBPATH']) if lenv['WITH_BF_TIFF']: libincs += Split(lenv['BF_TIFF_LIBPATH']) if lenv['WITH_BF_FFTW3']: diff --git a/tools/btools.py b/tools/btools.py index e76ada3a985..a703103c59c 100644 --- a/tools/btools.py +++ b/tools/btools.py @@ -73,7 +73,7 @@ def validate_arguments(args, bc): 'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG', - 'WITH_BF_LCMS', 'BF_LCMS_LIB', + 'WITH_BF_LCMS', 'BF_LCMS', 'BF_LCMS_INC', 'BF_LCMS_LIB', 'BF_LCMS_LIBPATH', 'WITH_BF_DOCS', 'BF_NUMJOBS', 'BF_MSVS', @@ -261,12 +261,18 @@ def read_opts(env, cfg, args): ('BF_PNG_LIB', 'PNG library', ''), ('BF_PNG_LIBPATH', 'PNG library path', ''), - (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)), + (BoolVariable('WITH_BF_TIFF', 'Use TIFF if true', True)), ('BF_TIFF', 'TIFF base path', ''), ('BF_TIFF_INC', 'TIFF include path', ''), ('BF_TIFF_LIB', 'TIFF library', ''), ('BF_TIFF_LIBPATH', 'TIFF library path', ''), + (BoolVariable('WITH_BF_LCMS', 'Enable color correction with lcms', False)), + ('BF_LCMS', 'LCMS base path', ''), + ('BF_LCMS_INC', 'LCMS include path', ''), + ('BF_LCMS_LIB', 'LCMS library', ''), + ('BF_LCMS_LIBPATH', 'LCMS library path', ''), + (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)), ('BF_ZLIB', 'ZLib base path', ''), ('BF_ZLIB_INC', 'ZLib include path', ''), @@ -418,9 +424,6 @@ 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_LCMS', 'Enable color correction with lcms', False)), - ('BF_LCMS_LIB', 'LCMSlibrary', 'lcms'), - ('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)), |