diff options
author | 2019-09-29 15:30:18 +0200 | |
---|---|---|
committer | 2019-09-29 09:30:18 -0400 | |
commit | ed2b7e5ef1626c0d6318b6ea71897efbb4356277 (patch) | |
tree | 62a84a4a2c804922839dbfa60ec664b84beaaee0 /3rdparty/genie/src/tools/dotnet.lua | |
parent | 1bd1288c9e17bdba9544d1e56be7618106fece7e (diff) |
Synced with GENie upstream revision e78d6c1 (#5631)
* Synced with GENie upstream revision e78d6c1
* Add Visual Studio 2019 support
* Fix hardcoded -m64
* Switch appveyor to Visual Studio 2019
* Fix genie being built as 32-bit
* MSVC build is known to be broken currently. Let it fail until all the known issues are fixed.
* Update the packages before building
* Build with 3 threads
Appveyor VMs have only 2 cores and 8 GB RAM.
* Enable caching of pacman cache
Diffstat (limited to '3rdparty/genie/src/tools/dotnet.lua')
-rw-r--r-- | 3rdparty/genie/src/tools/dotnet.lua | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/3rdparty/genie/src/tools/dotnet.lua b/3rdparty/genie/src/tools/dotnet.lua index 69feffa2599..bc7ca36c945 100644 --- a/3rdparty/genie/src/tools/dotnet.lua +++ b/3rdparty/genie/src/tools/dotnet.lua @@ -4,10 +4,10 @@ -- Copyright (c) 2002-2009 Jason Perkins and the Premake project -- - + premake.dotnet = { } premake.dotnet.namestyle = "windows" - + -- -- Translation of Premake flags into CSC flags @@ -40,9 +40,9 @@ return "None" end end - - - + + + -- -- Returns the compiler filename (they all use the same arguments) -- @@ -51,13 +51,7 @@ if (_OPTIONS.dotnet == "msnet") then return "csc" elseif (_OPTIONS.dotnet == "mono") then - if (cfg.framework <= "1.1") then - return "mcs" - elseif (cfg.framework >= "4.0") then - return "dmcs" - else - return "gmcs" - end + return "mcs" else return "cscc" end @@ -71,7 +65,7 @@ function premake.dotnet.getflags(cfg) local result = table.translate(cfg.flags, flags) - return result + return result end @@ -88,4 +82,4 @@ elseif (cfg.kind == "SharedLib") then return "Library" end - end
\ No newline at end of file + end |