diff options
| author | 2017-01-25 12:21:30 +1100 | |
|---|---|---|
| committer | 2017-01-25 12:21:30 +1100 | |
| commit | 145cd1618fa7fca059c4036dbf266c321a89b7c1 (patch) | |
| tree | fd6b277fbee99b956d82457918275490763db668 /scripts | |
| parent | be7552fa577ab6704841750f93262d5beb0acef2 (diff) | |
| parent | 22c42abfdf438781183c9a18486a38fe35946305 (diff) | |
Merge tag 'mame0182' of https://github.com/mamedev/mame
MAME 0.182
Conflicts:
src/mame/drivers/aristmk5.cpp
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/src/3rdparty.lua | 4 | ||||
| -rw-r--r-- | scripts/src/osd/sdl.lua | 3 |
2 files changed, 4 insertions, 3 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 diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index af6ff1b98ce..5970f6d3334 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -113,7 +113,8 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*" or "vs*" } targetprefix "sdl" links { - "psapi" + "psapi", + "Ole32", } configuration { } |
