[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56534] trunk/blender: Fix OS X 32 bit build error, and bring buildbot config in sync with default.

Brecht Van Lommel brechtvanlommel at pandora.be
Tue May 7 20:32:38 CEST 2013


Revision: 56534
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56534
Author:   blendix
Date:     2013-05-07 18:32:37 +0000 (Tue, 07 May 2013)
Log Message:
-----------
Fix OS X 32 bit build error, and bring buildbot config in sync with default.

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
    trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
    trunk/blender/source/blender/windowmanager/WM_keymap.h

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-05-07 16:41:59 UTC (rev 56533)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-05-07 18:32:37 UTC (rev 56534)
@@ -317,6 +317,9 @@
 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

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-05-07 16:41:59 UTC (rev 56533)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-05-07 18:32:37 UTC (rev 56534)
@@ -317,6 +317,9 @@
 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

Modified: trunk/blender/source/blender/windowmanager/WM_keymap.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_keymap.h	2013-05-07 16:41:59 UTC (rev 56533)
+++ trunk/blender/source/blender/windowmanager/WM_keymap.h	2013-05-07 18:32:37 UTC (rev 56534)
@@ -32,6 +32,7 @@
 
 /* dna-savable wmStructs here */
 #include "DNA_windowmanager_types.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {




More information about the Bf-blender-cvs mailing list