From f3aa813b9887ccdc70becdaea4bff636ac96cc2e Mon Sep 17 00:00:00 2001 From: Jesse Jaara Date: Sat, 6 Oct 2012 21:38:50 +0300 Subject: [PATCH] ElementClasses.cpp and ToolClasses.cpp need to be generated before being added to sources list. --- SConscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SConscript b/SConscript index 3073136a2..3f17bce4d 100644 --- a/SConscript +++ b/SConscript @@ -237,8 +237,6 @@ if(GetOption('win')): sources+=Glob("src/*/*.cpp") sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/tools/*.cpp") -sources+=Glob("generated/ToolClasses.cpp") -sources+=Glob("generated/ElementClasses.cpp") if(GetOption('win')): sources = filter(lambda source: str(source) != 'src/simulation/Gravity.cpp', sources) @@ -274,7 +272,11 @@ if(GetOption('win')): 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") +sources+=Glob("generated/ElementClasses.cpp") + env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python2 generator.py tools $TARGETS $SOURCES") +sources+=Glob("generated/ToolClasses.cpp") + env.Decider('MD5') t=env.Program(target=programName, source=sources) Default(t)