Fix OS X 32 bit build error, and bring buildbot config in sync with default.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 7 May 2013 18:32:37 +0000 (18:32 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 7 May 2013 18:32:37 +0000 (18:32 +0000)
build_files/buildbot/config/user-config-mac-i386.py
build_files/buildbot/config/user-config-mac-x86_64.py
source/blender/windowmanager/WM_keymap.h

index e39b13039c587e8b4c6e4074bacad90c4fc254a2..e7b1b68810008a1951a0cf02b3e92c5dcc3a06da 100644 (file)
@@ -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
index 0331bdf3ab29376b76ffcfa00d9f2eb0b5a40053..f5f6bf84796344b967748743bc6bbea49d912c34 100644 (file)
@@ -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
index 6f3b90c00a1f48267507627459cb0201767691bf..8d37db000c0841883d69b930ca8c27bbd9088b0c 100644 (file)
@@ -32,6 +32,7 @@
 
 /* dna-savable wmStructs here */
 #include "DNA_windowmanager_types.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {