From 61db5737b5e5defe62e1ac213a18d470507bb718 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Tue, 19 Feb 2019 18:59:26 +0700 Subject: [PATCH] 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. --- scripts/genie.lua | 20 ++++++++++---------- 1 file 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 {