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

Silence warnings about arguments unknown to Clang, fixed a mistake

Browse Source
This commit is contained in:
Manu Evans 2015-07-26 11:08:44 +10:00
parent eab093302c
commit 04a7cd1546
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1076,13 +1076,15 @@
function m.debugInformationFormat(cfg)
local value
local tool, toolVersion = p.config.toolset(cfg)
if cfg.flags.Symbols then
if cfg.debugformat == "c7" then
value = "OldStyle"
elseif cfg.architecture == "x86_64" or
cfg.clr ~= p.OFF or
config.isOptimizedBuild(cfg) or
cfg.editandcontinue == p.OFF
cfg.editandcontinue == p.OFF or
(toolVersion and toolVersion:startswith("LLVM-vs"))
then
value = "ProgramDatabase"
else
@ -1509,7 +1511,7 @@
function m.platformToolset(cfg)
local tool, version = p.config.toolset(cfg)
if version then
if tonumber(version) ~= nil then
if tonumber(version:sub(1,3)) ~= nil then
version = "v" .. version
end
else
@ -1683,7 +1685,8 @@
end
function m.bufferSecurityCheck(cfg)
if cfg.flags.NoBufferSecurityCheck then
local tool, toolVersion = p.config.toolset(cfg)
if cfg.flags.NoBufferSecurityCheck or (toolVersion and toolVersion:startswith("LLVM-vs")) then
m.element("BufferSecurityCheck", nil, "false")
end
end

6
tests/actions/vstudio/vc2010/test_platform_toolset.lua
View File

@ -87,7 +87,7 @@
]]
end
function suite.canOverrideFromScript_withV()
function suite.canOverrideFromScript_withXP()
toolset "v120_xp"
prepare()
test.capture [[
@ -95,7 +95,7 @@
]]
end
function suite.canOverrideFromScript_withV()
function suite.canOverrideFromScript_withLLVM()
toolset "LLVM-vs2010"
prepare()
test.capture [[
@ -103,7 +103,7 @@
]]
end
function suite.canOverrideFromScript_withMsc()
function suite.canOverrideFromScript_withMscAndLLVM()
toolset "msc-llvm-vs2014_xp"
prepare()
test.capture [[