Merged in triton/premake-cs-fixes/cs-noconfig (pull request #66)

C# Make projects now specify the "/noconfig" csc/mcs flag to behave like VS.
This commit is contained in:
Jason Perkins 2013-10-24 11:38:52 -04:00
commit b9739214dc
2 changed files with 7 additions and 2 deletions

View File

@ -177,6 +177,11 @@
function dotnet.getflags(cfg) function dotnet.getflags(cfg)
local flags = config.mapFlags(cfg, dotnet.flags) local flags = config.mapFlags(cfg, dotnet.flags)
-- Tells the compiler not to include the csc.rsp response file which
-- it does by default and references all the assemblies shipped with
-- the .NET Framework. VS sets this flag by default for C# projects.
table.insert(flags, '/noconfig')
if cfg.project.icon then if cfg.project.icon then
local fn = project.getrelative(cfg.project, cfg.project.icon) local fn = project.getrelative(cfg.project, cfg.project.icon)
table.insert(flags, string.format('/win32icon:"%s"', fn)) table.insert(flags, string.format('/win32icon:"%s"', fn))

View File

@ -34,7 +34,7 @@
function suite.isEmptyAssignment_onNoSettings() function suite.isEmptyAssignment_onNoSettings()
prepare() prepare()
test.capture [[ test.capture [[
FLAGS = FLAGS = /noconfig
]] ]]
end end
@ -47,6 +47,6 @@
icon "MyProject.ico" icon "MyProject.ico"
prepare() prepare()
test.capture [[ test.capture [[
FLAGS = /win32icon:"MyProject.ico" FLAGS = /noconfig /win32icon:"MyProject.ico"
]] ]]
end end