summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-06-18 17:15:17 +0200
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-06-18 17:15:17 +0200
commitb4beaa37b744c8b2804ff398e373e035a7e8941c (patch)
tree93b7a1edcfb25197fce1028959f1f494fa3d461b /scripts/src/osd
parent0213201d1d902f7f166afd8f0ded227b009dfc07 (diff)
parent1ad39fd8250863ff4c7f90e84d971db006085a17 (diff)
Merge remote-tracking branch 'mainline/master'
Diffstat (limited to 'scripts/src/osd')
-rw-r--r--scripts/src/osd/modules.lua2
-rw-r--r--scripts/src/osd/windows.lua2
2 files changed, 1 insertions, 3 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 5fb1d23c1bc..b8e5bb61b83 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -244,7 +244,7 @@ function qtdebuggerbuild()
}
local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then
- configuration { "gmake" }
+ configuration { "gmake or ninja" }
if (version >= 30600) then
buildoptions {
"-Wno-inconsistent-missing-override",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 8b48b8f0771..9307c6dec71 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -154,8 +154,6 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
- MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",