MASM preprocessor definitions (#917)

* MASM preprocessor definitions
This commit is contained in:
J Guy Davidson 2017-10-13 17:06:57 +01:00 committed by Tom van Dijck
parent 798b72b7d4
commit 922440da94

View File

@ -794,6 +794,7 @@
local fileCfgFunc = function(fcfg, condition) local fileCfgFunc = function(fcfg, condition)
if fcfg then if fcfg then
return { return {
m.MasmPreprocessorDefinitions,
m.excludedFromBuild, m.excludedFromBuild,
m.exceptionHandlingSEH, m.exceptionHandlingSEH,
} }
@ -1028,7 +1029,7 @@
if not checkFunc or checkFunc(cfg, fcfg) then if not checkFunc or checkFunc(cfg, fcfg) then
p.callArray(fileCfgFunc, fcfg, m.configPair(cfg)) p.callArray(fileCfgFunc, fcfg, m.configPair(cfg))
end end
end end
if #m.conditionalElements > 0 then if #m.conditionalElements > 0 then
m.emitConditionalElements(prj) m.emitConditionalElements(prj)
end end
@ -1891,6 +1892,13 @@
end end
function m.MasmPreprocessorDefinitions(cfg, condition)
if cfg.defines then
m.preprocessorDefinitions(cfg, cfg.defines, false, condition)
end
end
function m.minimalRebuild(cfg) function m.minimalRebuild(cfg)
if config.isOptimizedBuild(cfg) or if config.isOptimizedBuild(cfg) or
cfg.flags.NoMinimalRebuild or cfg.flags.NoMinimalRebuild or
@ -2455,7 +2463,7 @@
else else
element.setting = value .. table.concat(arg) element.setting = value .. table.concat(arg)
end end
else else
element.setting = element.value element.setting = element.value
end end
table.insert(m.conditionalElements, element) table.insert(m.conditionalElements, element)