Fix OS X 32 bit build error, and bring buildbot config in sync with default.
This commit is contained in:
parent
aa959b4e7d
commit
13c0ef139f
|
@ -317,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = True
|
|||
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
|
||||
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
||||
|
||||
#Freestyle
|
||||
WITH_BF_FREESTYLE = True
|
||||
|
||||
#Ray trace optimization
|
||||
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
|
||||
WITH_BF_RAYOPTIMIZATION = True
|
||||
|
|
|
@ -317,6 +317,9 @@ WITH_BF_CYCLES_CUDA_BINARIES = True
|
|||
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
|
||||
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
|
||||
|
||||
#Freestyle
|
||||
WITH_BF_FREESTYLE = True
|
||||
|
||||
#Ray trace optimization
|
||||
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
|
||||
WITH_BF_RAYOPTIMIZATION = True
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
/* dna-savable wmStructs here */
|
||||
#include "DNA_windowmanager_types.h"
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
Loading…
Reference in New Issue