diff options
author | 2017-01-26 19:55:37 +0100 | |
---|---|---|
committer | 2017-01-26 19:55:37 +0100 | |
commit | f603c763fe35a81bd3a7f41ab8a53c61c953e2cb (patch) | |
tree | 26b3659573426ea0111c3d5203b3eea78e508357 /scripts/src/3rdparty.lua | |
parent | 4e5f922341d962577d19a62ee4ed21c7de1fc8f0 (diff) | |
parent | 4ba1c0f2cad36dc23613e0dec24e7e439d3e80fd (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts/src/3rdparty.lua')
-rw-r--r-- | scripts/src/3rdparty.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 2cb7a145b91..e5b64df3ac0 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -917,14 +917,14 @@ project "portaudio" "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced "/wd4127", -- warning C4127: conditional expression is constant } - if _OPTIONS["vs"]=="intel-15" then + if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd869", -- remark #869: parameter "xxx" was never referenced "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated "/Qwd2544", -- message #2544: empty dependent statement in if-statement "/Qwd1879", -- warning #1879: unimplemented pragma ignored } - end + end configuration { "vs2015*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration |