summaryrefslogtreecommitdiffstats
path: root/scripts/genie.lua
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-12-20 14:02:40 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2019-12-20 14:02:40 +1100
commita734555ec1e6eb58d4d6b0094f6a19bffdb77d9a (patch)
tree50d17b5ad222e733c4e6429f973974c82c630483 /scripts/genie.lua
parent9d9631e23e0171914398e50fbdcf360ef3b8d5a3 (diff)
parent825cd426397585aaf7600db160ba1569e42b3f51 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r--scripts/genie.lua27
1 files changed, 13 insertions, 14 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 6aa28173b1d..0f9f38b3721 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1335,6 +1335,7 @@ end
buildoptions {
"/WX", -- Treats all compiler warnings as errors.
+ "/w45038", -- warning C5038: data member 'member1' will be initialized after data member 'member2'
"/wd4025", -- warning C4025: 'number' : based pointer passed to function with variable arguments: parameter number
"/wd4003", -- warning C4003: not enough actual parameters for macro 'xxx'
"/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch
@@ -1396,6 +1397,18 @@ end
"/wd4800", -- warning C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
"/wd4371", -- warning C4371: layout of class may have changed from a previous version of the compiler due to better packing of member 'member'
"/wd4548", -- warning C4548: expression before comma has no effect; expected expression with side-effect
+
+ "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
+ "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
+ "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter
+ "/wd4458", -- warning C4458: declaration of 'xxx' hides class member
+ "/wd4459", -- warning C4459: declaration of 'xxx' hides global declaration
+ "/wd4838", -- warning C4838: conversion from 'xxx' to 'yyy' requires a narrowing conversion
+ "/wd4091", -- warning C4091: 'typedef ': ignored on left of '' when no variable is declared
+ "/wd4463", -- warning C4463: overflow; assigning 1 to bit-field that can only hold values from -1 to 0
+ "/wd4297", -- warning C4297: 'xxx::~xxx': function assumed not to throw an exception but does
+ "/wd4319", -- warning C4319: 'operator' : zero extending 'type' to 'type' of greater size
+ "/wd4592", -- warning C4592: symbol will be dynamically initialized (implementation limitation)
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
@@ -1463,20 +1476,6 @@ end
includedirs {
MAME_DIR .. "3rdparty/dxsdk/Include"
}
-configuration { "vs201*" }
- buildoptions {
- "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
- "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter
- "/wd4458", -- warning C4458: declaration of 'xxx' hides class member
- "/wd4459", -- warning C4459: declaration of 'xxx' hides global declaration
- "/wd4838", -- warning C4838: conversion from 'xxx' to 'yyy' requires a narrowing conversion
- "/wd4091", -- warning C4091: 'typedef ': ignored on left of '' when no variable is declared
- "/wd4463", -- warning C4463: overflow; assigning 1 to bit-field that can only hold values from -1 to 0
- "/wd4297", -- warning C4297: 'xxx::~xxx': function assumed not to throw an exception but does
- "/wd4319", -- warning C4319: 'operator' : zero extending 'type' to 'type' of greater size
- "/wd4592", -- warning C4592: symbol will be dynamically initialized (implementation limitation)
- }
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