summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua1
-rw-r--r--scripts/src/bus.lua18
-rw-r--r--scripts/src/cpu.lua2
-rw-r--r--scripts/src/emu.lua2
-rw-r--r--scripts/src/lib.lua2
-rw-r--r--scripts/src/machine.lua11
6 files changed, 31 insertions, 5 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index f84cebf43ac..e3c29933220 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -722,6 +722,7 @@ end
"-Wno-uninitialized",
"-Wno-unused-function",
"-Wno-unused-but-set-variable",
+ "-Wno-format-extra-args", -- temp for mingw 6.1 till update bgfx code
}
configuration { "rpi" }
buildoptions {
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index f5283748490..fa5f6dabd15 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1662,8 +1662,8 @@ if (BUSES["RS232"]~=null) then
MAME_DIR .. "src/devices/bus/rs232/pty.h",
MAME_DIR .. "src/devices/bus/rs232/ser_mouse.cpp",
MAME_DIR .. "src/devices/bus/rs232/ser_mouse.h",
- MAME_DIR .. "src/devices/bus/rs232/sparckbd.cpp",
- MAME_DIR .. "src/devices/bus/rs232/sparckbd.h",
+ MAME_DIR .. "src/devices/bus/rs232/sun_kbd.cpp",
+ MAME_DIR .. "src/devices/bus/rs232/sun_kbd.h",
MAME_DIR .. "src/devices/bus/rs232/terminal.cpp",
MAME_DIR .. "src/devices/bus/rs232/terminal.h",
MAME_DIR .. "src/devices/bus/rs232/xvd701.cpp",
@@ -2577,6 +2577,20 @@ end
---------------------------------------------------
--
+--@src/devices/bus/sunkbd/sunkbd.h,BUSES["SUNKBD"] = true
+---------------------------------------------------
+
+if (BUSES["SUNKBD"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/sunkbd/hlekbd.cpp",
+ MAME_DIR .. "src/devices/bus/sunkbd/hlekbd.h",
+ MAME_DIR .. "src/devices/bus/sunkbd/sunkbd.cpp",
+ MAME_DIR .. "src/devices/bus/sunkbd/sunkbd.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/ql/exp.h,BUSES["QL"] = true
---------------------------------------------------
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index ef9263c6485..a9dfe0ecd70 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -13,7 +13,7 @@
-- Dynamic recompiler objects
--------------------------------------------------
-if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null) then
+if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/drcbec.cpp",
MAME_DIR .. "src/devices/cpu/drcbec.h",
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index a446a6ccaae..1f96f3b4e22 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -118,8 +118,6 @@ files {
MAME_DIR .. "src/emu/emupal.h",
MAME_DIR .. "src/emu/fileio.cpp",
MAME_DIR .. "src/emu/fileio.h",
- MAME_DIR .. "src/emu/hash.cpp",
- MAME_DIR .. "src/emu/hash.h",
MAME_DIR .. "src/emu/image.cpp",
MAME_DIR .. "src/emu/image.h",
MAME_DIR .. "src/emu/input.cpp",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 00bc51897d8..7353c87c1d9 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -56,6 +56,8 @@ project "utils"
MAME_DIR .. "src/lib/util/flac.h",
MAME_DIR .. "src/lib/util/harddisk.cpp",
MAME_DIR .. "src/lib/util/harddisk.h",
+ MAME_DIR .. "src/lib/util/hash.cpp",
+ MAME_DIR .. "src/lib/util/hash.h",
MAME_DIR .. "src/lib/util/hashing.cpp",
MAME_DIR .. "src/lib/util/hashing.h",
MAME_DIR .. "src/lib/util/huffman.cpp",
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index a4e3a9032cc..45753bf8bde 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2914,3 +2914,14 @@ if (MACHINES["SCNXX562"]~=null) then
MAME_DIR .. "src/devices/machine/scnxx562.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/machine/input_merger.h,MACHINES["INPUT_MERGER"] = true
+---------------------------------------------------
+if (MACHINES["INPUT_MERGER"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/input_merger.cpp",
+ MAME_DIR .. "src/devices/machine/input_merger.h",
+ }
+end