[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61142] trunk/blender/build_files: OSX: also remove USE_QTKIT option from configs, leave env var for later use ( always True )

jens verwiebe info at jensverwiebe.de
Tue Nov 5 17:04:32 CET 2013


Revision: 61142
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61142
Author:   jensverwiebe
Date:     2013-11-05 16:04:32 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: also remove USE_QTKIT option from configs, leave env var for later use ( always True )

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/build_files/scons/config/darwin-config.py

Modified: trunk/blender/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-11-05 16:00:23 UTC (rev 61141)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-11-05 16:04:32 UTC (rev 61142)
@@ -43,9 +43,6 @@
 cmd_sdk=commands.getoutput(cmd)
 MACOSX_SDK_CHECK=cmd_sdk
 
-USE_QTKIT=True # Carbon quicktime is not available for 64bit
-
-
 # Default target OSX settings per architecture
 # Can be customized
 

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-11-05 16:00:23 UTC (rev 61141)
+++ trunk/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-11-05 16:04:32 UTC (rev 61142)
@@ -43,9 +43,6 @@
 cmd_sdk=commands.getoutput(cmd)
 MACOSX_SDK_CHECK=cmd_sdk
 
-USE_QTKIT=True # Carbon quicktime is not available for 64bit
-
-
 # Default target OSX settings per architecture
 # Can be customized
 

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-11-05 16:00:23 UTC (rev 61141)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-11-05 16:04:32 UTC (rev 61142)
@@ -49,10 +49,6 @@
 else:
 	XCODE_BUNDLE=XCODE_SELECT_PATH
 
-if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc64':
-    USE_QTKIT=True # Carbon quicktime is not available for 64bit
-
-
 # Default target OSX settings per architecture
 # Can be customized
 




More information about the Bf-blender-cvs mailing list