summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-12-31 19:23:22 (GMT)
committer jacob1 <jfu614@gmail.com>2012-12-31 19:23:22 (GMT)
commitb0eadcde6c92193e5589ccc3884e1d26aea0934b (patch)
treed6c6d9042ec56510060880afa8bccba11ee2b05b /SConscript
parent2b1454139d7f86ddc91e2c058361d7aa8e635d4a (diff)
downloadpowder-b0eadcde6c92193e5589ccc3884e1d26aea0934b.zip
powder-b0eadcde6c92193e5589ccc3884e1d26aea0934b.tar.gz
sconscript fix (same as before)
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript10
1 files changed, 8 insertions, 2 deletions
diff --git a/SConscript b/SConscript
index 0be993f..a435ff9 100644
--- a/SConscript
+++ b/SConscript
@@ -289,15 +289,21 @@ if(GetOption('release')):
else:
env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer', '-funsafe-loop-optimizations', '-Wunsafe-loop-optimizations'])
+
+if(GetOption('lin')):
+ pythonVer = "python2"
+else:
+ pythonVer = "python"
+
if(GetOption('win')):
envCopy = env.Clone()
envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2'])
sources+=envCopy.Object('src/simulation/Gravity.cpp')
-env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python2 generator.py elements $TARGETS $SOURCES")
+env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), pythonVer + " generator.py elements $TARGETS $SOURCES")
sources+=Glob("generated/ElementClasses.cpp")
-env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python2 generator.py tools $TARGETS $SOURCES")
+env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), pythonVer + " generator.py tools $TARGETS $SOURCES")
sources+=Glob("generated/ToolClasses.cpp")
env.Decider('MD5')