[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24647] trunk/blender: scons update to enable build with QTKit (Cocoa Quicktime)

[Damien Plisson]

Revision: 24647
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24647
Author:   damien78
Date:     2009-11-18 16:54:25 +0100 (Wed, 18 Nov 2009)

Log Message:
-----------
scons update to enable build with QTKit (Cocoa Quicktime)
Thx Jens Verwiebe for the patch

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/darwin-config.py
    trunk/blender/source/blender/quicktime/SConscript
    trunk/blender/tools/btools.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2009-11-18 15:01:59 UTC (rev 24646)
+++ trunk/blender/SConstruct	2009-11-18 15:54:25 UTC (rev 24647)
@@ -224,6 +224,11 @@
 	env.Append(CFLAGS=['-DGHOST_COCOA']) 
 	env.Append(CXXFLAGS=['-DGHOST_COCOA'])
 	env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+    
+if env['USE_QTKIT'] == True:
+	env.Append(CFLAGS=['-DUSE_QTKIT']) 
+	env.Append(CXXFLAGS=['-DUSE_QTKIT'])
+	env.Append(CPPFLAGS=['-DUSE_QTKIT'])
 
 #check for additional debug libnames
 

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2009-11-18 15:01:59 UTC (rev 24646)
+++ trunk/blender/config/darwin-config.py	2009-11-18 15:54:25 UTC (rev 24647)
@@ -13,7 +13,6 @@
 #############################################################################
 ###################     Cocoa & architecture settings      ##################
 #############################################################################
-
 WITH_GHOST_COCOA=True
 MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
 
@@ -33,6 +32,10 @@
 
 BF_PYTHON_VERSION = '3.1'
 
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+	USE_QTKIT=True # Carbon quicktime is not available for 64bit
+
+
 # Default target OSX settings per architecture
 # Can be customized
 
@@ -231,10 +234,7 @@
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
-if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
-	WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME ( disable for 64bit atm )
-else:
-	WITH_BF_QUICKTIME = True
+WITH_BF_QUICKTIME = True
 
 WITH_BF_ICONV = True
 BF_ICONV = '/usr'
@@ -287,7 +287,10 @@
 	PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
 
 if WITH_BF_QUICKTIME == True:
-	PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+	if USE_QTKIT == True:
+		PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
+	else:
+		PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
 
 #note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
 LLIBS = ['stdc++', 'SystemStubs']

Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript	2009-11-18 15:01:59 UTC (rev 24646)
+++ trunk/blender/source/blender/quicktime/SConscript	2009-11-18 15:54:25 UTC (rev 24647)
@@ -1,9 +1,15 @@
 #!/usr/bin/python
 Import ('env')
 
-source_files = ['apple/quicktime_import.c',
+
+if env['USE_QTKIT']:
+    source_files = ['apple/qtkit_import.m',
+                'apple/qtkit_export.m']
+else:
+    source_files = ['apple/quicktime_import.c',
                 'apple/quicktime_export.c']
 
+
 incs  = ['.',
 		 '../quicktime',
 		 '../makesdna',

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2009-11-18 15:01:59 UTC (rev 24646)
+++ trunk/blender/tools/btools.py	2009-11-18 15:54:25 UTC (rev 24647)
@@ -65,6 +65,7 @@
 			'WITHOUT_BF_PYTHON_INSTALL',
 			'WITH_BF_OPENMP',
 			'WITH_GHOST_COCOA',
+			'USE_QTKIT',
 			'BF_FANCY', 'BF_QUIET',
 			'BF_X264_CONFIG',
 			'BF_XVIDCORE_CONFIG',
@@ -314,6 +315,7 @@
 
 		(BoolVariable('WITH_BF_OPENMP', 'Use OpenMP if true', False)),
 		(BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true', False)),
+		(BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)),
 
 		(BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),
 		('BF_QUICKTIME', 'QuickTime base path', ''),