diff options
author | 2016-04-10 13:34:23 -0400 | |
---|---|---|
committer | 2016-04-10 13:34:23 -0400 | |
commit | c4d91605fce01ecc1ec77219366b8cae4422c1e1 (patch) | |
tree | 7a20c8fc27bc62e75633f2c569b92203c31cbe67 /scripts/src | |
parent | 114a8f8218a4940f759ee000be7957445d7643ba (diff) | |
parent | dd9c9a0fb3778f0d3cfbd65674d2a2f0f22f38aa (diff) |
Merge branch 'master' of https://github.com/mamedev/mame.git
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 1 | ||||
-rw-r--r-- | scripts/src/bus.lua | 17 | ||||
-rw-r--r-- | scripts/src/emu.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 12 |
4 files changed, 30 insertions, 1 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index a404872fde4..cfb6fa14069 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -801,6 +801,7 @@ end MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp", MAME_DIR .. "3rdparty/bgfx/src/image.cpp", MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp", + MAME_DIR .. "3rdparty/bgfx/src/hmd_openvr.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d9.cpp", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index c3f8bbd43d3..43a86be74c2 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -705,6 +705,23 @@ end --------------------------------------------------- -- +--@src/devices/bus/intv/slot.h,BUSES["INTV_CTRL"] = true +--------------------------------------------------- + +if (BUSES["INTV_CTRL"]~=null) then + files { + MAME_DIR .. "src/devices/bus/intv_ctrl/ctrl.cpp", + MAME_DIR .. "src/devices/bus/intv_ctrl/ctrl.h", + MAME_DIR .. "src/devices/bus/intv_ctrl/handctrl.cpp", + MAME_DIR .. "src/devices/bus/intv_ctrl/handctrl.h", + MAME_DIR .. "src/devices/bus/intv_ctrl/ecs_ctrl.cpp", + MAME_DIR .. "src/devices/bus/intv_ctrl/ecs_ctrl.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/isa/isa.h,BUSES["ISA"] = true --------------------------------------------------- diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 6ca1594f4dc..71cd9c8064e 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -158,7 +158,6 @@ files { MAME_DIR .. "src/emu/mame.h", MAME_DIR .. "src/emu/machine.cpp", MAME_DIR .. "src/emu/machine.h", - MAME_DIR .. "src/emu/machine.ipp", MAME_DIR .. "src/emu/mconfig.cpp", MAME_DIR .. "src/emu/mconfig.h", MAME_DIR .. "src/emu/memarray.cpp", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 9c85a9cc998..91eaa395ba1 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -91,6 +91,18 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/output/none.cpp", MAME_DIR .. "src/osd/modules/output/console.cpp", MAME_DIR .. "src/osd/modules/output/network.cpp", + MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp", + MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h", + MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp", + MAME_DIR .. "src/osd/modules/ipc/tcp_server.h", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.cpp", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.h", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.cpp", + MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.h", + MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.cpp", + 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", } includedirs { ext_includedir("uv"), |