summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-12-29 17:45:43 (GMT)
committer jacob1 <jfu614@gmail.com>2012-12-29 17:45:43 (GMT)
commit0159c2b5afa7a6fe976858240ead67a7645e242c (patch)
treec37a557cc9fa14db1f794657f02284222d99abdc /SConscript
parent22a6213000c0f5f7f3fbf6da14e717ac1e360452 (diff)
downloadpowder-0159c2b5afa7a6fe976858240ead67a7645e242c.zip
powder-0159c2b5afa7a6fe976858240ead67a7645e242c.tar.gz
more scons fixes for windows
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript9
1 files changed, 7 insertions, 2 deletions
diff --git a/SConscript b/SConscript
index 2ac687d..4e480f4 100644
--- a/SConscript
+++ b/SConscript
@@ -285,10 +285,15 @@ if(GetOption('win')):
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")
+if(GetOption('lin')):
+ pythonVer = "python2"
+else:
+ pythonVer = "python"
+
+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')