summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Brad Hughes <brad@hughesonline.us>2016-09-16 13:51:18 -0400
committer GitHub <noreply@github.com>2016-09-16 13:51:18 -0400
commitd5ab804c2b72b139b8c5cbe09fe9344e9396860f (patch)
tree0e457080c30e90327555e2a70f4955a588ed52ac /scripts/src
parent9fdb02e0029b3798498b8fa40e8c0429d7b6527e (diff)
parentbf52d118267c0326c74fec648d789731d05ae304 (diff)
Merge pull request #1403 from bradhugh/monitor_module
Convert OSD monitor info to modules plus add DXGI implementation
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/osd/modules.lua6
-rw-r--r--scripts/src/osd/sdl.lua1
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 59cbc8c1d32..7fb7a81f90b 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -60,6 +60,7 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
MAME_DIR .. "src/osd/modules/sound/sound_module.h",
MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_module.h",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_module.h",
MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
@@ -118,6 +119,11 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.h",
MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.cpp",
MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.h",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_common.h",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_common.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_win32.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_dxgi.cpp",
+ MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp",
}
includedirs {
ext_includedir("uv"),
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 44b957d8dde..af6ff1b98ce 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -422,7 +422,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/sdlmain.cpp",
MAME_DIR .. "src/osd/osdepend.h",
MAME_DIR .. "src/osd/sdl/video.cpp",
- MAME_DIR .. "src/osd/sdl/video.h",
MAME_DIR .. "src/osd/sdl/window.cpp",
MAME_DIR .. "src/osd/sdl/window.h",
MAME_DIR .. "src/osd/modules/osdwindow.cpp",