diff options
| author | Thomas Dinges <blender@dingto.org> | 2011-11-09 01:46:31 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2011-11-09 01:46:31 +0400 |
| commit | 7f273394d599293d41b5bff37b3ad56bb507a1c8 (patch) | |
| tree | ffbb005631fd9907554558ddeee22762f6ef84fd /build_files/scons | |
| parent | 262ac7340e79ce1fd3a902ce6121426837c6a316 (diff) | |
Cycles:
* Scons: Disable Cycles per default on Linux/Mac for now until compile issues have been sorted out.
Diffstat (limited to 'build_files/scons')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/linux-config.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 38c8dca6cd2..69cf54dc740 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -254,6 +254,8 @@ BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' WITH_BF_QUICKTIME = True +WITH_BF_CYCLES = False + WITH_BF_ICONV = True BF_ICONV = '/usr' BF_ICONV_INC = '${BF_ICONV}/include' diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 91f86ae7e80..9e2352c51fc 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -178,6 +178,8 @@ BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib' BF_JEMALLOC_LIB = 'jemalloc' BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a' +WITH_BF_CYCLES = False + WITH_BF_OPENMP = True #Ray trace optimization |