matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more scons fixes for windows

Browse Source
This commit is contained in:
jacob1 2012-12-29 12:45:43 -05:00
parent 22a6213000
commit 0159c2b5af
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SConscript
View File

@ -285,10 +285,15 @@ if(GetOption('win')):
envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2']) envCopy.Append(CCFLAGS=['-mincoming-stack-boundary=2'])
sources+=envCopy.Object('src/simulation/Gravity.cpp') 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") 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") sources+=Glob("generated/ToolClasses.cpp")
env.Decider('MD5') env.Decider('MD5')

1
src/client/ThumbnailBroker.cpp
View File

@ -1,6 +1,7 @@
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <typeinfo> #include <typeinfo>
#include <time.h>
#include "ThumbnailBroker.h" #include "ThumbnailBroker.h"
#include "ThumbnailListener.h" #include "ThumbnailListener.h"
#include "Client.h" #include "Client.h"

1
src/search/SearchController.cpp
View File

@ -1,5 +1,6 @@
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <time.h>
#include "SearchController.h" #include "SearchController.h"
#include "SearchModel.h" #include "SearchModel.h"
#include "SearchView.h" #include "SearchView.h"