summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--3rdparty/softfloat3/build/MAME/platform.h2
-rw-r--r--scripts/genie.lua43
2 files changed, 43 insertions, 2 deletions
diff --git a/3rdparty/softfloat3/build/MAME/platform.h b/3rdparty/softfloat3/build/MAME/platform.h
index 96fc81e348e..5dfa704955c 100644
--- a/3rdparty/softfloat3/build/MAME/platform.h
+++ b/3rdparty/softfloat3/build/MAME/platform.h
@@ -54,7 +54,7 @@ Softfloat 3 MAME modifications
/*----------------------------------------------------------------------------
*----------------------------------------------------------------------------*/
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
#define _INC_MALLOC 0
#include <intrin.h>
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 5d85297dfee..fd09446d595 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -509,6 +509,34 @@ configuration { "Release", "vs20*" }
"NoIncrementalLink",
}
+configuration { "vsllvm" }
+ buildoptions {
+ "/bigobj",
+ }
+ flags {
+ "NoPCH",
+ "ExtraWarnings",
+ }
+ if not _OPTIONS["NOWERROR"] then
+ flags{
+ "FatalWarnings",
+ }
+ end
+
+
+configuration { "Debug", "vsllvm" }
+ flags {
+ "Symbols",
+ "NoMultiProcessorCompilation",
+ }
+
+configuration { "Release", "vsllvm" }
+ flags {
+ "Optimize",
+ "NoEditAndContinue",
+ "NoIncrementalLink",
+ }
+
-- Force VS2015/17 targets to use bundled SDL2
if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then
if _OPTIONS["with-bundled-sdl2"]==nil then
@@ -1276,6 +1304,16 @@ 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 {
@@ -1417,7 +1455,7 @@ configuration { "winphone8* or winstore8*" }
linkoptions {
"/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata
}
-configuration { "llvm" }
+configuration { "vsllvm" }
buildoptions {
"-Wno-tautological-constant-out-of-range-compare",
"-Wno-ignored-qualifiers",
@@ -1428,6 +1466,7 @@ configuration { "llvm" }
"-Wno-unused-label",
"-Wno-unused-local-typedef",
"-Wno-unused-const-variable",
+ "-Wno-unused-parameter",
"-Wno-unneeded-internal-declaration",
"-Wno-unused-private-field",
"-Wno-missing-braces",
@@ -1437,8 +1476,10 @@ configuration { "llvm" }
"-Wno-enum-conversion",
"-Wno-pragma-pack",
"-Wno-new-returns-null",
+ "-Wno-sign-compare",
"-Wno-switch",
"-Wno-tautological-undefined-compare",
+ "-Wno-deprecated-declarations",
}