summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/genie.lua
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2019-02-19 18:59:26 +0700
committer Patrick Mackinlay <pmackinlay@hotmail.com>2019-02-19 18:59:26 +0700
commit61db5737b5e5defe62e1ac213a18d470507bb718 (patch)
treeb787575046e81869553ea6b6478fcabe3be28082 /scripts/genie.lua
parentac876f3ebca74b71288a8b0a6f3e6cd1786e57b1 (diff)
genie: restore msvc build (nw)
I don't really understand why this works, but it enables building with VS 2017 15.7.6 as before. Apologies if it breaks LLVM on VS - I don't have that configuration to test.
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r--scripts/genie.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index fd09446d595..58571d1ffb8 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1294,6 +1294,15 @@ configuration { "mingw-clang" }
}
end
+configuration { "vsllvm" }
+ defines {
+ "XML_STATIC",
+ "WIN32",
+ "_WIN32",
+ "_CRT_NONSTDC_NO_DEPRECATE",
+ "_CRT_SECURE_NO_DEPRECATE",
+ "_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
+ }
configuration { "vs20*" }
defines {
@@ -1304,16 +1313,7 @@ configuration { "vs20*" }
"_CRT_SECURE_NO_DEPRECATE",
"_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
}
-
-configuration { "vsllvm" }
- defines {
- "XML_STATIC",
- "WIN32",
- "_WIN32",
- "_CRT_NONSTDC_NO_DEPRECATE",
- "_CRT_SECURE_NO_DEPRECATE",
- "_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
- }
+
-- Windows Store/Phone projects already link against the available libraries.
if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or string.startswith(_OPTIONS["vs"], "winphone8")) then
links {