diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-17 11:03:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-17 11:03:12 +0400 |
commit | 4514be8f4ff5c87824e447c7016939363f66f78c (patch) | |
tree | 23f829755b81c71891d831ac8b9c57a23a283e2d /source/blender/blenkernel/SConscript | |
parent | 2a12e8b7e4a08fb57e72de5ce62d61b698828f84 (diff) | |
parent | 1294504603dcd538f3900e3d254e37375cde9c35 (diff) |
svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/SConscript')
-rw-r--r-- | source/blender/blenkernel/SConscript | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index ff04b46e18e..70641b340b2 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -79,10 +79,6 @@ if env['OURPLATFORM'] == 'darwin': if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') -if env['WITH_BF_LCMS']: - defs.append('WITH_LCMS') - incs += ' ' + env['BF_LCMS_INC'] - if env['WITH_BF_LZO']: incs += ' #/extern/lzo/minilzo' defs.append('WITH_LZO') |