AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #341 from Blizzard/targetmachine

Browse Source 
Add targetMachine property.
This commit is contained in:
starkos 2015-11-04 15:12:20 -05:00
commit 82c85e30ca
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -406,6 +406,7 @@
m.treatLinkerWarningAsErrors, m.treatLinkerWarningAsErrors,
m.ignoreDefaultLibraries, m.ignoreDefaultLibraries,
m.largeAddressAware, m.largeAddressAware,
m.targetMachine,
m.additionalLinkOptions, m.additionalLinkOptions,
} }
end end
@ -430,6 +431,7 @@
if cfg.kind == p.STATICLIB then if cfg.kind == p.STATICLIB then
return { return {
m.treatLinkerWarningAsErrors, m.treatLinkerWarningAsErrors,
m.targetMachine,
m.additionalLinkOptions, m.additionalLinkOptions,
} }
else else
@ -953,6 +955,18 @@
end end
function m.targetMachine(cfg)
local targetmachine = {
x86 = "MachineX86",
x86_64 = "MachineX64",
}
local value = targetmachine[cfg.architecture]
if (value ~= nil) then
m.element("TargetMachine", nil, '%s', value)
end
end
function m.additionalCompileOptions(cfg, condition) function m.additionalCompileOptions(cfg, condition)
if #cfg.buildoptions > 0 then if #cfg.buildoptions > 0 then
local opts = table.concat(cfg.buildoptions, " ") local opts = table.concat(cfg.buildoptions, " ")