Revision: 41319
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41319
Author: jensverwiebe
Date: 2011-10-27 15:50:51 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
OSX: adapt comments to new behaviour when compiling with gcc-4.6 but GHOST and
QT with default compiler
Modified Paths:
--------------
trunk/blender/intern/ghost/SConscript
trunk/blender/source/blender/quicktime/SConscript
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2011-10-27 15:46:26 UTC (rev
41318)
+++ trunk/blender/intern/ghost/SConscript 2011-10-27 15:50:51 UTC (rev
41319)
@@ -107,7 +107,7 @@
if window_system in ('win32-vc', 'win64-vc'):
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs,
libtype=['intern','player'], priority = [40,15]) #,
cc_compileflags=env['CCFLAGS'].append('/WX') )
-elif env['WITH_GHOST_COCOA']: # always use Apple-gcc-4.2 for objC language,
for gnu-compilers do not support it fully yet
+elif env['WITH_GHOST_COCOA']: # always use default-Apple-gcc for objC
language, for gnu-compilers do not support it fully yet
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs,
libtype=['intern','player'], priority = [40,15],
cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript 2011-10-27 15:46:26 UTC
(rev 41318)
+++ trunk/blender/source/blender/quicktime/SConscript 2011-10-27 15:50:51 UTC
(rev 41319)
@@ -35,6 +35,6 @@
if env['WITH_GHOST_COCOA']:
defs.append('GHOST_COCOA')
- env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs,
defines=defs, libtype=types, priority=priorities,
cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always
use Apple-gcc-4.2 for objC language, for gnu-compilers do not support it fully
yet
+ env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs,
defines=defs, libtype=types, priority=priorities,
cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') # always
use default-Apple-gcc for objC language, gnu-compilers do not support it fully
yet
else:
env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs,
defines=defs, libtype=types, priority=priorities)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
