[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13978] trunk/blender/SConstruct: Bugfix for wrong OpenMP flags when using icc ( proposed by jensverwiebe via IRC)

[Daniel Genrich]

Revision: 13978
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13978
Author:   genscher
Date:     2008-03-05 15:58:33 +0100 (Wed, 05 Mar 2008)

Log Message:
-----------
Bugfix for wrong OpenMP flags when using icc (proposed by jensverwiebe via IRC)

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2008-03-05 11:42:40 UTC (rev 13977)
+++ trunk/blender/SConstruct	2008-03-05 14:58:33 UTC (rev 13978)
@@ -185,10 +185,16 @@
 		env['CPPFLAGS'].append('/openmp')
 		env['CXXFLAGS'].append('/openmp')
 	else:
-		env.Append(LINKFLAGS=['-lgomp'])
-		env['CCFLAGS'].append('-fopenmp')
-		env['CPPFLAGS'].append('-fopenmp')
-		env['CXXFLAGS'].append('-fopenmp')
+		if env['CC'] == 'icc':
+			env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+			env['CCFLAGS'].append('-openmp')
+			env['CPPFLAGS'].append('-openmp')
+			env['CXXFLAGS'].append('-openmp')
+		else:
+			env.Append(LINKFLAGS=['-lgomp'])
+			env['CCFLAGS'].append('-fopenmp')
+			env['CPPFLAGS'].append('-fopenmp')
+			env['CXXFLAGS'].append('-fopenmp')
 
 #check for additional debug libnames