summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua1
-rw-r--r--scripts/src/3rdparty.lua53
-rw-r--r--scripts/src/bus.lua17
-rw-r--r--scripts/src/emu.lua5
-rw-r--r--scripts/src/osd/modules.lua19
-rw-r--r--scripts/src/osd/osdmini.lua4
-rw-r--r--scripts/src/osd/sdl.lua1
-rw-r--r--scripts/src/osd/windows.lua33
-rw-r--r--scripts/target/mame/arcade.lua3
-rw-r--r--scripts/target/mame/mess.lua1
10 files changed, 88 insertions, 49 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 92e3897217e..a3c59ca7462 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -953,6 +953,7 @@ end
"-Wno-inline-new-delete",
"-Wno-constant-logical-operand",
"-Wno-deprecated-register",
+ "-fdiagnostics-show-note-include-stack",
}
if (version >= 30500) then
buildoptions {
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 9666b7563bb..cfb6fa14069 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -271,7 +271,7 @@ end
"HAVE_CONFIG_H=1",
}
- configuration { "gmake"}
+ configuration { "gmake" }
buildoptions_c {
"-Wno-unused-function",
"-O0",
@@ -324,6 +324,17 @@ project "7z"
uuid "ad573d62-e76a-4b11-ae34-5110a6789a42"
kind "StaticLib"
+ configuration { "gmake" }
+ buildoptions_c {
+ "-Wno-undef",
+ "-Wno-strict-prototypes",
+ }
+
+ configuration { "mingw*" }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ }
+
configuration { "vs*" }
buildoptions {
"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
@@ -346,24 +357,47 @@ end
}
files {
+ MAME_DIR .. "3rdparty/lzma/C/7zAlloc.c",
+ MAME_DIR .. "3rdparty/lzma/C/7zArcIn.c",
MAME_DIR .. "3rdparty/lzma/C/7zBuf.c",
MAME_DIR .. "3rdparty/lzma/C/7zBuf2.c",
MAME_DIR .. "3rdparty/lzma/C/7zCrc.c",
MAME_DIR .. "3rdparty/lzma/C/7zCrcOpt.c",
MAME_DIR .. "3rdparty/lzma/C/7zDec.c",
- MAME_DIR .. "3rdparty/lzma/C/7zIn.c",
+ MAME_DIR .. "3rdparty/lzma/C/7zFile.c",
+ MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
+ MAME_DIR .. "3rdparty/lzma/C/Aes.c",
+ MAME_DIR .. "3rdparty/lzma/C/AesOpt.c",
+ MAME_DIR .. "3rdparty/lzma/C/Alloc.c",
+ MAME_DIR .. "3rdparty/lzma/C/Bcj2.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/Bcj2Enc.c",
+ MAME_DIR .. "3rdparty/lzma/C/Bra.c",
+ MAME_DIR .. "3rdparty/lzma/C/Bra86.c",
+ MAME_DIR .. "3rdparty/lzma/C/BraIA64.c",
MAME_DIR .. "3rdparty/lzma/C/CpuArch.c",
- MAME_DIR .. "3rdparty/lzma/C/LzmaDec.c",
+ MAME_DIR .. "3rdparty/lzma/C/Delta.c",
+ MAME_DIR .. "3rdparty/lzma/C/LzFind.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/LzFindMt.c",
MAME_DIR .. "3rdparty/lzma/C/Lzma2Dec.c",
- MAME_DIR .. "3rdparty/lzma/C/LzmaEnc.c",
MAME_DIR .. "3rdparty/lzma/C/Lzma2Enc.c",
- MAME_DIR .. "3rdparty/lzma/C/LzFind.c",
- MAME_DIR .. "3rdparty/lzma/C/Bra.c",
- MAME_DIR .. "3rdparty/lzma/C/Bra86.c",
- MAME_DIR .. "3rdparty/lzma/C/Bcj2.c",
+ MAME_DIR .. "3rdparty/lzma/C/Lzma86Dec.c",
+ MAME_DIR .. "3rdparty/lzma/C/Lzma86Enc.c",
+ MAME_DIR .. "3rdparty/lzma/C/LzmaDec.c",
+ MAME_DIR .. "3rdparty/lzma/C/LzmaEnc.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/LzmaLib.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/MtCoder.c",
MAME_DIR .. "3rdparty/lzma/C/Ppmd7.c",
MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c",
- MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
+ MAME_DIR .. "3rdparty/lzma/C/Ppmd7Enc.c",
+ MAME_DIR .. "3rdparty/lzma/C/Sha256.c",
+ MAME_DIR .. "3rdparty/lzma/C/Sort.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/Threads.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/Xz.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzCrc64.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzCrc64Opt.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzDec.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzEnc.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzIn.c",
}
--------------------------------------------------
@@ -767,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..61563970d1b 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",
@@ -248,8 +247,6 @@ files {
MAME_DIR .. "src/emu/ui/auditmenu.h",
MAME_DIR .. "src/emu/ui/cmddata.h",
MAME_DIR .. "src/emu/ui/cmdrender.h",
- MAME_DIR .. "src/emu/ui/ctrlmenu.cpp",
- MAME_DIR .. "src/emu/ui/ctrlmenu.h",
MAME_DIR .. "src/emu/ui/custmenu.cpp",
MAME_DIR .. "src/emu/ui/custmenu.h",
MAME_DIR .. "src/emu/ui/custui.cpp",
@@ -261,8 +258,6 @@ files {
MAME_DIR .. "src/emu/ui/defimg.h",
MAME_DIR .. "src/emu/ui/dirmenu.cpp",
MAME_DIR .. "src/emu/ui/dirmenu.h",
- MAME_DIR .. "src/emu/ui/dsplmenu.cpp",
- MAME_DIR .. "src/emu/ui/dsplmenu.h",
MAME_DIR .. "src/emu/ui/icorender.h",
MAME_DIR .. "src/emu/ui/inifile.cpp",
MAME_DIR .. "src/emu/ui/inifile.h",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 1b21f157d8a..91eaa395ba1 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -87,6 +87,25 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
MAME_DIR .. "src/osd/modules/input/input_xinput.h",
MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp",
+ MAME_DIR .. "src/osd/modules/output/output_module.h",
+ 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"),
}
if _OPTIONS["targetos"]=="windows" then
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index 4869ec8716d..efdb28bd9c0 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -93,6 +93,10 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
MAME_DIR .. "src/osd/modules/input/input_windows.h",
MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
+ MAME_DIR .. "src/osd/modules/output/output_module.h",
+ MAME_DIR .. "src/osd/modules/output/none.cpp",
+ MAME_DIR .. "src/osd/modules/output/console.cpp",
+ MAME_DIR .. "src/osd/modules/output/network.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index bdef2c5fad3..c42d9ab23ad 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -425,7 +425,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/window.h",
MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
- MAME_DIR .. "src/osd/sdl/output.cpp",
MAME_DIR .. "src/osd/sdl/watchdog.cpp",
MAME_DIR .. "src/osd/sdl/watchdog.h",
MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index eb1fd828226..e4be22d6e55 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -165,8 +165,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/render/drawgdi.h",
MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
MAME_DIR .. "src/osd/modules/render/drawnone.h",
- MAME_DIR .. "src/osd/windows/output.cpp",
- MAME_DIR .. "src/osd/windows/output.h",
MAME_DIR .. "src/osd/windows/video.cpp",
MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
@@ -262,34 +260,3 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
}
-
-
---------------------------------------------------
--- ledutil
---------------------------------------------------
-
-if _OPTIONS["with-tools"] then
- project("ledutil")
- uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- links {
- "ocore_" .. _OPTIONS["osd"],
- }
-
- includedirs {
- MAME_DIR .. "src/osd",
- }
-
- files {
- MAME_DIR .. "src/osd/windows/ledutil.cpp",
- }
-end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index f67e069028a..3fa206f4947 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -601,6 +601,7 @@ BUSES["CENTRONICS"] = true
--BUSES["EP64"] = true
--BUSES["EPSON_SIO"] = true
--BUSES["GAMEBOY"] = true
+BUSES["GAMEGEAR"] = true
--BUSES["GBA"] = true
BUSES["GENERIC"] = true
--BUSES["IEEE488"] = true
@@ -632,7 +633,7 @@ BUSES["RS232"] = true
--BUSES["SATURN"] = true
BUSES["SCSI"] = true
--BUSES["SCV"] = true
---BUSES["SEGA8"] = true
+BUSES["SEGA8"] = true
BUSES["SMS_CTRL"] = true
BUSES["SMS_EXP"] = true
--BUSES["SNES"] = true
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 39ab656cf0b..854493641a6 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -618,6 +618,7 @@ BUSES["GENERIC"] = true
BUSES["IEEE488"] = true
BUSES["IMI7000"] = true
BUSES["INTV"] = true
+BUSES["INTV_CTRL"] = true
BUSES["IQ151"] = true
BUSES["ISA"] = true
BUSES["ISBX"] = true