Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Curioni <maxime.curioni@gmail.com>2008-09-08 22:37:24 +0400
committerMaxime Curioni <maxime.curioni@gmail.com>2008-09-08 22:37:24 +0400
commit4565944248175e84a2b3663202cae0c86fcee5b9 (patch)
tree708c4f90fd8910217a366371d04b027f8d2436d3 /SConstruct
parent98b18bc679388a2c036c9fed48a835ac71963b7f (diff)
parentde4828036857e76141ca336997b99978ee09fb5f (diff)
soc-2008-mxcurioni: merged changes to revision 16424, corrected compilation errors
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct9
1 files changed, 5 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 53b3ce70328..4cff807c5a6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -184,15 +184,16 @@ if env['WITH_BF_OPENMP'] == 1:
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
else:
- if env['CC'] == 'icc':
+ if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
env['CPPFLAGS'].append('-openmp')
env['CXXFLAGS'].append('-openmp')
else:
- env['CCFLAGS'].append('-fopenmp')
- env['CPPFLAGS'].append('-fopenmp')
- env['CXXFLAGS'].append('-fopenmp')
+ env.Append(CCFLAGS=['-fopenmp'])
+ env.Append(CPPFLAGS=['-fopenmp'])
+ env.Append(CXXFLAGS=['-fopenmp'])
+ # env.Append(LINKFLAGS=['-fprofile-generate'])
#check for additional debug libnames