[Bf-blender-cvs] [abab4f1] master: Fix scons+mingw64 compiling - Ensure WITH_BF_CYCLES_LOGGING is defined and turned off

Joshua Leung noreply at git.blender.org
Fri Dec 5 02:15:59 CET 2014


Commit: abab4f19e646e49db9f5334526a415ea8f4cb96b
Author: Joshua Leung
Date:   Fri Dec 5 13:13:34 2014 +1300
Branches: master
https://developer.blender.org/rBabab4f19e646e49db9f5334526a415ea8f4cb96b

Fix scons+mingw64 compiling - Ensure WITH_BF_CYCLES_LOGGING is defined and turned off

===================================================================

M	build_files/scons/config/win64-mingw-config.py

===================================================================

diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py
index 92dcd6d..0314ab1 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -142,6 +142,7 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
 
 #Cycles
 WITH_BF_CYCLES = True
+WITH_BF_CYCLES_LOGGING = False
 WITH_BF_CYCLES_CUDA_BINARIES = False
 BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50']




More information about the Bf-blender-cvs mailing list