[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44904] trunk/blender/build_files/scons: OSX/scons: also allow for omp-builds with gcc-4.6.2 and 4.6.3 ( tested ), TODO: check if we can compile objC/objC++ with newer gcc too

[jens verwiebe]

Revision: 44904
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44904
Author:   jensverwiebe
Date:     2012-03-15 14:57:51 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
OSX/scons: also allow for omp-builds with gcc-4.6.2 and 4.6.3 ( tested ), TODO: check if we can compile objC/objC++ with newer gcc too

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

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2012-03-15 14:57:49 UTC (rev 44903)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2012-03-15 14:57:51 UTC (rev 44904)
@@ -95,7 +95,7 @@
 
 #Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
 # if your compiler does not have accurate suffix you may have to enable it by hand !
-if CC.endswith('4.6.1'):
+if CC[:-2].endswith('4.6'):
     WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
 else:
     WITH_BF_OPENMP = False

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2012-03-15 14:57:49 UTC (rev 44903)
+++ trunk/blender/build_files/scons/tools/Blender.py	2012-03-15 14:57:51 UTC (rev 44904)
@@ -617,7 +617,7 @@
     commands.getoutput(cmd)
     cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
     commands.getoutput(cmd)
-    if env['CC'].endswith('4.6.1'): # for correct errorhandling with gcc 4.6.1 we need the gcc.dylib to link, thus distribute in app-bundle
+    if env['CC'][:-2].endswith('4.6'): # for correct errorhandling with gcc 4.6.x we need the gcc.dylib to link, thus distribute in app-bundle
         cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
         commands.getoutput(cmd)
         instname = env['BF_CXX']