Remove makefile, changes to generator, SConscript to work together

This commit is contained in:
build.powdertoy.co.uk
2012-07-23 20:58:38 +01:00
parent 64ebd1117b
commit 281f5518b2
3 changed files with 19 additions and 120 deletions

View File

@@ -174,7 +174,9 @@ if(GetOption('win32')):
sources+=Glob("src/*/*.cpp")
sources+=Glob("src/simulation/elements/*.cpp")
sources+=Glob("src/simulation/tools/*.cpp")
sources+=Glob("generated/*.cpp")
sources+=Glob("generated/ToolClasses.cpp")
sources+=Glob("generated/ElementClasses.cpp")
SetupSpawn(env)
@@ -195,6 +197,8 @@ if(GetOption('macosx')):
if(GetOption('win32')):
programName += ".exe"
env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python generator.py elements $TARGETS $SOURCES")
env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python generateTools.py $TARGETS $SOURCES")
t=env.Program(target=programName, source=sources)
Default(t)