Merge pull request #600 from sbx320/bugfix/598

Fix for #598
This commit is contained in:
Samuel Surtees 2016-11-04 12:02:24 +10:00 committed by GitHub
commit 30dda54f12

View File

@ -310,7 +310,6 @@
m.clCompileAdditionalUsingDirectories, m.clCompileAdditionalUsingDirectories,
m.forceIncludes, m.forceIncludes,
m.debugInformationFormat, m.debugInformationFormat,
m.programDataBaseFileName,
m.optimization, m.optimization,
m.functionLevelLinking, m.functionLevelLinking,
m.intrinsicFunctions, m.intrinsicFunctions,
@ -411,6 +410,7 @@
m.largeAddressAware, m.largeAddressAware,
m.targetMachine, m.targetMachine,
m.additionalLinkOptions, m.additionalLinkOptions,
m.programDatabaseFile,
} }
end end
end end
@ -1815,9 +1815,9 @@
end end
function m.programDataBaseFileName(cfg) function m.programDatabaseFile(cfg)
if cfg.symbolspath and cfg.symbols == p.ON and cfg.debugformat ~= "c7" then if cfg.symbolspath and cfg.symbols == p.ON and cfg.debugformat ~= "c7" then
m.element("ProgramDataBaseFileName", nil, p.project.getrelative(cfg.project, cfg.symbolspath)) m.element("ProgramDatabaseFile", nil, p.project.getrelative(cfg.project, cfg.symbolspath))
end end
end end