[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40616] branches/soc-2011-tomato: Merging r40612 through r40614 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 40616
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40616
Author:   nazgul
Date:     2011-09-27 13:22:34 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Merging r40612 through r40614 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40612
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40614

Modified Paths:
--------------
    branches/soc-2011-tomato/build_files/scons/tools/Blender.py
    branches/soc-2011-tomato/intern/ghost/SConscript

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40611
   + /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40614

Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py	2011-09-27 13:22:13 UTC (rev 40615)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py	2011-09-27 13:22:34 UTC (rev 40616)
@@ -699,7 +699,7 @@
         SConsEnvironment.Default(self, res)
         resources.append(res)
 
-    def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None):
+    def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None, cc_compilerchange=None, cxx_compilerchange=None):
         global vcp
         if not self or not libname or not sources:
             print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
@@ -737,6 +737,10 @@
                 lenv.Replace(CCFLAGS = cc_compileflags)
             if cxx_compileflags:
                 lenv.Replace(CXXFLAGS = cxx_compileflags)
+            if cc_compilerchange:
+                lenv.Replace(CC = cc_compilerchange)
+            if cxx_compilerchange:
+                lenv.Replace(CXX = cxx_compilerchange)
             lenv.Append(CFLAGS = lenv['C_WARN'])
             lenv.Append(CCFLAGS = lenv['CC_WARN'])
             lenv.Append(CXXFLAGS = lenv['CXX_WARN'])

Modified: branches/soc-2011-tomato/intern/ghost/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/ghost/SConscript	2011-09-27 13:22:13 UTC (rev 40615)
+++ branches/soc-2011-tomato/intern/ghost/SConscript	2011-09-27 13:22:34 UTC (rev 40616)
@@ -100,6 +100,11 @@
     incs = env['BF_WINTAB_INC'] + ' ' + incs
 
 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') ) 
+    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') )
+
+elif env['OURPLATFORM'] == 'darwin' and env['CC'].endswith('4.6.1'):	 # compile ghost always with apple-gcc to keep objectiveC compatibility
+    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2' ) #, cc_compileflags=env['CXXFLAGS'].append('-fobjc-exceptions')
+    print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
+
 else:
-    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) 
+    env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-40611
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-40614