From 7f273394d599293d41b5bff37b3ad56bb507a1c8 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 8 Nov 2011 21:46:31 +0000 Subject: Cycles: * Scons: Disable Cycles per default on Linux/Mac for now until compile issues have been sorted out. --- build_files/scons/config/darwin-config.py | 2 ++ build_files/scons/config/linux-config.py | 2 ++ 2 files changed, 4 insertions(+) (limited to 'build_files/scons') 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 -- cgit v1.2.3