diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /3rdparty/genie/src/actions/vstudio/_vstudio.lua | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to '3rdparty/genie/src/actions/vstudio/_vstudio.lua')
-rw-r--r-- | 3rdparty/genie/src/actions/vstudio/_vstudio.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/3rdparty/genie/src/actions/vstudio/_vstudio.lua b/3rdparty/genie/src/actions/vstudio/_vstudio.lua index 9d7e8dc3886..d9b8538c4ea 100644 --- a/3rdparty/genie/src/actions/vstudio/_vstudio.lua +++ b/3rdparty/genie/src/actions/vstudio/_vstudio.lua @@ -16,6 +16,7 @@ vs2013 = "v120", vs2015 = "v140", vs2017 = "v141", + vsllvm = "llvm", } premake.vstudio.toolset = toolsets[_ACTION] or "unknown?" premake.vstudio.splashpath = '' |