Permalink
Browse files

more scons fixes for windows

  • Loading branch information...
1 parent 22a6213 commit 0159c2b5afa7a6fe976858240ead67a7645e242c @jacob1 jacob1 committed Dec 29, 2012
Showing with 9 additions and 2 deletions.
  1. +7 −2 SConscript
  2. +1 −0 src/client/ThumbnailBroker.cpp
  3. +1 −0 src/search/SearchController.cpp
View
@@ -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')
@@ -1,6 +1,7 @@
#include <algorithm>
#include <iostream>
#include <typeinfo>
+#include <time.h>
#include "ThumbnailBroker.h"
#include "ThumbnailListener.h"
#include "Client.h"
@@ -1,5 +1,6 @@
#include <string>
#include <sstream>
+#include <time.h>
#include "SearchController.h"
#include "SearchModel.h"
#include "SearchView.h"

0 comments on commit 0159c2b

Please sign in to comment.