[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61124] trunk/blender/build_files/scons: OSX: preparing carbon and quicktime dropping, make 64bit and QTKit default , make 10.8sdk default for xcode >= 4.4

jens verwiebe info at jensverwiebe.de
Tue Nov 5 13:48:32 CET 2013


Revision: 61124
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61124
Author:   jensverwiebe
Date:     2013-11-05 12:48:32 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: preparing carbon and quicktime dropping, make 64bit and QTKit default, make 10.8sdk default for xcode >= 4.4

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-11-05 12:11:25 UTC (rev 61123)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-11-05 12:48:32 UTC (rev 61124)
@@ -14,7 +14,7 @@
 ###################     Cocoa & architecture settings      ##################
 #############################################################################
 WITH_GHOST_COCOA=True
-MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
 
 
 cmd = 'uname -p'
@@ -97,7 +97,7 @@
         # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! )
         MAC_MIN_VERS = '10.6'
         MACOSX_DEPLOYMENT_TARGET = '10.6'
-        MACOSX_SDK='/Developer/SDKs/MacOSX10.7.sdk'
+        MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk'
         LCGDIR = '#../lib/darwin-9.x.universal'
         CC = 'gcc'
         CXX = 'g++'

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2013-11-05 12:11:25 UTC (rev 61123)
+++ trunk/blender/build_files/scons/tools/btools.py	2013-11-05 12:48:32 UTC (rev 61124)
@@ -428,7 +428,7 @@
         (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL for windowing rather then the native APIs', False)),
         (BoolVariable('WITH_X11_XINPUT', 'Enable X11 Xinput (tablet support and unicode input)', True)),
         (BoolVariable('WITH_X11_XF86VMODE', 'Enable X11 video mode switching', True)),
-        (BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)),
+        (BoolVariable('USE_QTKIT', 'Use QTKIT if true', True)),
         ('BF_OPENMP_LIB_STATIC', 'OpenMP static library', ''),
 
         (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),




More information about the Bf-blender-cvs mailing list