From 21821af720ca3d668c76d917f2926ba9d117c6eb Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Mon, 13 Aug 2012 18:07:27 +0100 Subject: [PATCH] "everything at once" compilation in a seperate arg --- SConscript | 9 ++++++--- site_scons/site_tools/mfprogram/__init__.pyc | Bin 7254 -> 7254 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SConscript b/SConscript index cb2f1b48f..35f0a9b0d 100644 --- a/SConscript +++ b/SConscript @@ -47,6 +47,8 @@ AddOption('--minor-version',dest="minor-version",default=False,help="Minor versi AddOption('--build-number',dest="build-number",default=False,help="Build number.") AddOption('--snapshot',dest="snapshot",action='store_true',default=False,help="Snapshot build.") +AddOption('--aao', dest="everythingAtOnce", action='store_true', default=False, help="Compile the whole game without generating intermediate objects (very slow), enable this when using compilers like clang or mscc that don't support -fkeep-inline-functions") + if((not GetOption('lin')) and (not GetOption('win')) and (not GetOption('macosx'))): print "You must specify a platform to target" raise SystemExit(1) @@ -230,11 +232,12 @@ if(GetOption('win')): if(GetOption('release')): env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer', '-funsafe-loop-optimizations', '-Wunsafe-loop-optimizations']) - #env.Command(programName, sources, "gcc -o $TARGETS $SOURCES") - env.Decider('MD5') + +if(GetOption('everythingAtOnce')): 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 generator.py tools $TARGETS $SOURCES") - t=env.MFProgram(target=programName, source=sources) + env.Decider('MD5') + t=env.Program(target=programName, source=sources) Default(t) else: env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python generator.py elements $TARGETS $SOURCES") diff --git a/site_scons/site_tools/mfprogram/__init__.pyc b/site_scons/site_tools/mfprogram/__init__.pyc index edc9a1b4b33abcb9dea44a6198591957ea1ebd26..38b61cde091a60091f7d81999e90c39e29d099a6 100644 GIT binary patch delta 53 zcmca+am|8_`7fu`niX_Tu;CWNK#EJXK-_6Vqdc&HB;`jO=Wj J%$!P`2>{1r4t@Xt delta 53 zcmV-50LuT?IMz4@1M>|E4Jok(&2M L2bl>22_gw#*~Skr