diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-09-25 06:40:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-25 06:40:10 +0400 |
| commit | 314d460eb87ec6f383358e0dbb77e9fdf5c99f23 (patch) | |
| tree | dbad3bfa62dc321298218c3de15e666ff65d7950 /source/blender/blenkernel/SConscript | |
| parent | b4f235adc0a61a74b753db4704af0c02229eb856 (diff) | |
options WITH_LZO and WITH_LZMA for cmake and scons (default to true) pointcache.c also needed to have checks for these defines.
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 944667e2963..63631ddc40f 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -11,8 +11,6 @@ incs += ' #/extern/bullet2/src' incs += ' #/intern/opennl/extern #/intern/bsp/extern' incs += ' ../gpu #/extern/glew/include' incs += ' #/intern/smoke/extern' -incs += ' #/extern/lzo/minilzo' -incs += ' #/extern/lzma' incs += ' #/intern/audaspace/intern' incs += ' ' + env['BF_OPENGL_INC'] @@ -61,7 +59,15 @@ if env['BF_NO_ELBEEM']: if env['WITH_BF_LCMS']: defs.append('WITH_LCMS') - + +if env['WITH_BF_LZO']: + incs += ' #/extern/lzo/minilzo' + defs.append('WITH_LZO') + +if env['WITH_BF_LZMA']: + incs += ' #/extern/lzma' + defs.append('WITH_LZMA') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] |