diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-13 17:23:33 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-13 17:23:33 (GMT) |
| commit | 723677d43137e7e3686466cdbf348ddc7d7aeea0 (patch) | |
| tree | ce2826544405de3ac1797ade9ac1723b99af6615 | |
| parent | d8c299c30aa7b9f6cb4ecf2ed6661b7d4eca8eaf (diff) | |
| download | powder-723677d43137e7e3686466cdbf348ddc7d7aeea0.zip powder-723677d43137e7e3686466cdbf348ddc7d7aeea0.tar.gz | |
Add CPPDEFINES to the compile command
| -rw-r--r-- | SConscript | 2 | ||||
| -rw-r--r-- | site_scons/site_tools/mfprogram/__init__.py | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -237,7 +237,7 @@ 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") env.Decider('MD5') - t=env.Program(target=programName, source=sources) + t=env.MFProgram(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__.py b/site_scons/site_tools/mfprogram/__init__.py index 2d94ac2..97f075a 100644 --- a/site_scons/site_tools/mfprogram/__init__.py +++ b/site_scons/site_tools/mfprogram/__init__.py @@ -203,8 +203,13 @@ def MFProgramGenerator(source, target, env, for_signature): #else: # _CPPPATH.append(relpath(os.path.join(sconscript_dir, i), # destdir)) + + defines = "" + for t in env['CPPDEFINES']: + defines += ("-D"+str(t)+" ") + _CPPINCFLAGS = ['-I' + i for i in _CPPPATH] - _CCOMCOM = '$CPPFLAGS $_CPPDEFFLAGS %s' % ' '.join(_CPPINCFLAGS) + _CCOMCOM = '$CPPFLAGS $_CPPDEFFLAGS $defines %s' % ' '.join(_CPPINCFLAGS) libstr = "" for t in env['LIBS']: |