summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author feos <feos-theos@yandex.ru>2019-06-03 14:29:01 +0300
committer feos <feos-theos@yandex.ru>2019-06-03 14:29:01 +0300
commitaa1875694d34e751f5d5533bc4803eaf227776cb (patch)
treed76b5625239c79d40fba15afb94c4c4bd2580339
parent03dc6f0db5d9a771f00c1a0e0971796e50802821 (diff)
fix vsllvm configuration
- dxsdk was missing from includes - winmm was missing from libs - narrowing warning was silenced for VS, but not from vsllvm, where it leads to an error in menu_video_options::handle()
-rw-r--r--scripts/genie.lua4
-rw-r--r--scripts/src/osd/modules.lua1
2 files changed, 5 insertions, 0 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index a4ad02a2a32..aea60a45cc5 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1303,6 +1303,9 @@ configuration { "vsllvm" }
"_CRT_SECURE_NO_DEPRECATE",
"_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
}
+ includedirs {
+ MAME_DIR .. "3rdparty/dxsdk/Include"
+ }
configuration { "vs20*" }
defines {
@@ -1481,6 +1484,7 @@ configuration { "vsllvm" }
"-Wno-tautological-undefined-compare",
"-Wno-deprecated-declarations",
"-Wno-macro-redefined",
+ "-Wno-narrowing",
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index ddd2e4b06f2..1376be2b1d5 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -448,6 +448,7 @@ function osdmodulestargetconf()
"dsound",
"dxguid",
"oleaut32",
+ "winmm",
}
elseif _OPTIONS["targetos"]=="macosx" then
links {