diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-29 17:45:43 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-29 17:45:43 (GMT) |
| commit | 0159c2b5afa7a6fe976858240ead67a7645e242c (patch) | |
| tree | c37a557cc9fa14db1f794657f02284222d99abdc | |
| parent | 22a6213000c0f5f7f3fbf6da14e717ac1e360452 (diff) | |
| download | powder-0159c2b5afa7a6fe976858240ead67a7645e242c.zip powder-0159c2b5afa7a6fe976858240ead67a7645e242c.tar.gz | |
more scons fixes for windows
| -rw-r--r-- | SConscript | 9 | ||||
| -rw-r--r-- | src/client/ThumbnailBroker.cpp | 1 | ||||
| -rw-r--r-- | src/search/SearchController.cpp | 1 |
3 files changed, 9 insertions, 2 deletions
@@ -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') diff --git a/src/client/ThumbnailBroker.cpp b/src/client/ThumbnailBroker.cpp index 92ccfd8..85fee3a 100644 --- a/src/client/ThumbnailBroker.cpp +++ b/src/client/ThumbnailBroker.cpp @@ -1,6 +1,7 @@ #include <algorithm> #include <iostream> #include <typeinfo> +#include <time.h> #include "ThumbnailBroker.h" #include "ThumbnailListener.h" #include "Client.h" diff --git a/src/search/SearchController.cpp b/src/search/SearchController.cpp index 44ff681..012b761 100644 --- a/src/search/SearchController.cpp +++ b/src/search/SearchController.cpp @@ -1,5 +1,6 @@ #include <string> #include <sstream> +#include <time.h> #include "SearchController.h" #include "SearchModel.h" #include "SearchView.h" |