summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2021-06-21 13:53:49 -0700
committer Aaron Giles <aaron@aarongiles.com>2021-06-21 13:53:49 -0700
commit32dbba7d2d4513774b2d877b4c88f2d0760bcf54 (patch)
treef9e6426cf8dc28413c456bdbcd450c85cb302422 /scripts
parent5522729235b3ce81c839f3932c1aadc14de59e2b (diff)
parent2709c0143a8c7009715242c135b28403eeffce8b (diff)
Merge branch 'master' into deprecateddeprecated
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/bus.lua34
-rw-r--r--scripts/src/osd/windows.lua1
-rw-r--r--scripts/target/mame/arcade.lua20
-rw-r--r--scripts/target/mame/mess.lua50
4 files changed, 75 insertions, 30 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index fd54182bc0a..ae7ff3bfba9 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1614,6 +1614,8 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/bblue2.h",
MAME_DIR .. "src/devices/bus/isa/3xtwin.cpp",
MAME_DIR .. "src/devices/bus/isa/3xtwin.h",
+ MAME_DIR .. "src/devices/bus/isa/lrk330.cpp",
+ MAME_DIR .. "src/devices/bus/isa/lrk330.h",
}
end
@@ -1747,6 +1749,24 @@ end
---------------------------------------------------
--
+--@src/devices/bus/mc10/mc10_cart.h,BUSES["MC10"] = true
+---------------------------------------------------
+if (BUSES["MC10"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/mc10/mc10_cart.cpp",
+ MAME_DIR .. "src/devices/bus/mc10/mc10_cart.h",
+ MAME_DIR .. "src/devices/bus/mc10/mcx128.cpp",
+ MAME_DIR .. "src/devices/bus/mc10/mcx128.h",
+ MAME_DIR .. "src/devices/bus/mc10/pak.cpp",
+ MAME_DIR .. "src/devices/bus/mc10/pak.h",
+ MAME_DIR .. "src/devices/bus/mc10/ram.cpp",
+ MAME_DIR .. "src/devices/bus/mc10/ram.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/kc/kc.h,BUSES["KC"] = true
---------------------------------------------------
@@ -2462,6 +2482,8 @@ if (BUSES["A2BUS"]~=null) then
MAME_DIR .. "src/devices/bus/a2bus/suprterminal.h",
MAME_DIR .. "src/devices/bus/a2bus/timemasterho.cpp",
MAME_DIR .. "src/devices/bus/a2bus/timemasterho.h",
+ MAME_DIR .. "src/devices/bus/a2bus/titan3plus2.cpp",
+ MAME_DIR .. "src/devices/bus/a2bus/titan3plus2.h",
MAME_DIR .. "src/devices/bus/a2bus/transwarp.cpp",
MAME_DIR .. "src/devices/bus/a2bus/transwarp.h",
MAME_DIR .. "src/devices/bus/a2bus/uniprint.cpp",
@@ -3479,16 +3501,26 @@ if (BUSES["COCO"]~=null) then
MAME_DIR .. "src/devices/bus/coco/coco_sym12.h",
MAME_DIR .. "src/devices/bus/coco/coco_t4426.cpp",
MAME_DIR .. "src/devices/bus/coco/coco_t4426.h",
+ MAME_DIR .. "src/devices/bus/coco/coco_wpk.cpp",
+ MAME_DIR .. "src/devices/bus/coco/coco_wpk.h",
+ MAME_DIR .. "src/devices/bus/coco/coco_wpk2p.cpp",
+ MAME_DIR .. "src/devices/bus/coco/coco_wpk2p.h",
MAME_DIR .. "src/devices/bus/coco/cococart.cpp",
MAME_DIR .. "src/devices/bus/coco/cococart.h",
MAME_DIR .. "src/devices/bus/coco/dragon_amtor.cpp",
MAME_DIR .. "src/devices/bus/coco/dragon_amtor.h",
+ MAME_DIR .. "src/devices/bus/coco/dragon_claw.cpp",
+ MAME_DIR .. "src/devices/bus/coco/dragon_claw.h",
MAME_DIR .. "src/devices/bus/coco/dragon_fdc.cpp",
MAME_DIR .. "src/devices/bus/coco/dragon_fdc.h",
MAME_DIR .. "src/devices/bus/coco/dragon_jcbsnd.cpp",
MAME_DIR .. "src/devices/bus/coco/dragon_jcbsnd.h",
MAME_DIR .. "src/devices/bus/coco/dragon_jcbspch.cpp",
MAME_DIR .. "src/devices/bus/coco/dragon_jcbspch.h",
+ MAME_DIR .. "src/devices/bus/coco/dragon_msx2.cpp",
+ MAME_DIR .. "src/devices/bus/coco/dragon_msx2.h",
+ MAME_DIR .. "src/devices/bus/coco/dragon_serial.cpp",
+ MAME_DIR .. "src/devices/bus/coco/dragon_serial.h",
MAME_DIR .. "src/devices/bus/coco/dragon_sprites.cpp",
MAME_DIR .. "src/devices/bus/coco/dragon_sprites.h",
}
@@ -4465,8 +4497,6 @@ if (BUSES["SAITEK_OSA"]~=null) then
files {
MAME_DIR .. "src/devices/bus/saitek_osa/expansion.cpp",
MAME_DIR .. "src/devices/bus/saitek_osa/expansion.h",
- MAME_DIR .. "src/devices/bus/saitek_osa/modules.cpp",
- MAME_DIR .. "src/devices/bus/saitek_osa/modules.h",
MAME_DIR .. "src/devices/bus/saitek_osa/maestro.cpp",
MAME_DIR .. "src/devices/bus/saitek_osa/maestro.h",
MAME_DIR .. "src/devices/bus/saitek_osa/maestroa.cpp",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 963980b22ca..aa6b0241fb9 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -233,6 +233,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/eigccppc.h",
MAME_DIR .. "src/osd/eigccx86.h",
MAME_DIR .. "src/osd/eivc.h",
+ MAME_DIR .. "src/osd/eivcarm.h",
MAME_DIR .. "src/osd/eivcx86.h",
MAME_DIR .. "src/osd/eminline.h",
MAME_DIR .. "src/osd/osdcomm.h",
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 00ac2a26a6d..ad5d9ce3372 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -921,6 +921,7 @@ function linkProjects_mame_arcade(_target, _subtarget)
"midcoin",
"midw8080",
"midway",
+ "mr",
"namco",
"nasco",
"neogeo",
@@ -2913,6 +2914,15 @@ files {
MAME_DIR .. "src/mame/audio/sente6vb.h",
}
+createMAMEProjects(_target, _subtarget, "mr")
+files {
+ MAME_DIR .. "src/mame/drivers/dribling.cpp",
+ MAME_DIR .. "src/mame/includes/dribling.h",
+ MAME_DIR .. "src/mame/video/dribling.cpp",
+ MAME_DIR .. "src/mame/drivers/sshot.cpp",
+ MAME_DIR .. "src/mame/drivers/subhuntr.cpp",
+}
+
createMAMEProjects(_target, _subtarget, "namco")
files {
MAME_DIR .. "src/mame/drivers/20pacgal.cpp",
@@ -2943,6 +2953,7 @@ files {
MAME_DIR .. "src/mame/video/xevious.cpp",
MAME_DIR .. "src/mame/drivers/galaxian.cpp",
MAME_DIR .. "src/mame/includes/galaxian.h",
+ MAME_DIR .. "src/mame/drivers/galaxian_rockclim.cpp",
MAME_DIR .. "src/mame/audio/galaxian.cpp",
MAME_DIR .. "src/mame/audio/galaxian.h",
MAME_DIR .. "src/mame/video/galaxian.cpp",
@@ -3556,6 +3567,8 @@ files {
MAME_DIR .. "src/mame/machine/dc-ctrl.h",
MAME_DIR .. "src/mame/machine/jvs13551.cpp",
MAME_DIR .. "src/mame/machine/jvs13551.h",
+ MAME_DIR .. "src/mame/machine/segashiobd.cpp",
+ MAME_DIR .. "src/mame/machine/segashiobd.h",
MAME_DIR .. "src/mame/drivers/triforce.cpp",
MAME_DIR .. "src/mame/drivers/puckpkmn.cpp",
MAME_DIR .. "src/mame/drivers/segac2.cpp",
@@ -4561,8 +4574,6 @@ files {
MAME_DIR .. "src/mame/video/vs920a.cpp",
MAME_DIR .. "src/mame/video/vs920a.h",
MAME_DIR .. "src/mame/drivers/inufuku.cpp",
- MAME_DIR .. "src/mame/includes/inufuku.h",
- MAME_DIR .. "src/mame/video/inufuku.cpp",
MAME_DIR .. "src/mame/drivers/ojankohs.cpp",
MAME_DIR .. "src/mame/includes/ojankohs.h",
MAME_DIR .. "src/mame/video/ojankohs.cpp",
@@ -4884,9 +4895,6 @@ files {
MAME_DIR .. "src/mame/drivers/dorachan.cpp",
MAME_DIR .. "src/mame/drivers/drdmania.cpp",
MAME_DIR .. "src/mame/drivers/dreamwld.cpp",
- MAME_DIR .. "src/mame/drivers/dribling.cpp",
- MAME_DIR .. "src/mame/includes/dribling.h",
- MAME_DIR .. "src/mame/video/dribling.cpp",
MAME_DIR .. "src/mame/drivers/dwarfd.cpp",
MAME_DIR .. "src/mame/drivers/dynadice.cpp",
MAME_DIR .. "src/mame/drivers/dynamoah.cpp",
@@ -5114,7 +5122,6 @@ files {
MAME_DIR .. "src/mame/audio/special.h",
MAME_DIR .. "src/mame/drivers/spool99.cpp",
MAME_DIR .. "src/mame/drivers/sprcros2.cpp",
- MAME_DIR .. "src/mame/drivers/sshot.cpp",
MAME_DIR .. "src/mame/drivers/ssingles.cpp",
MAME_DIR .. "src/mame/drivers/sstrangr.cpp",
MAME_DIR .. "src/mame/drivers/startouch.cpp",
@@ -5122,7 +5129,6 @@ files {
MAME_DIR .. "src/mame/drivers/strkzn.cpp",
MAME_DIR .. "src/mame/drivers/stuntair.cpp",
MAME_DIR .. "src/mame/drivers/su2000.cpp",
- MAME_DIR .. "src/mame/drivers/subhuntr.cpp",
MAME_DIR .. "src/mame/drivers/summit.cpp",
MAME_DIR .. "src/mame/drivers/sumt8035.cpp",
MAME_DIR .. "src/mame/drivers/supercrd.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 1fe07c532ed..871ad4a66c7 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -831,25 +831,25 @@ BUSES["ACORN"] = true
BUSES["ADAM"] = true
BUSES["ADAMNET"] = true
BUSES["ADB"] = true
+BUSES["AMIGA_KEYBOARD"] = true
BUSES["APF"] = true
BUSES["APRICOT_EXPANSION"] = true
BUSES["APRICOT_KEYBOARD"] = true
BUSES["AQUARIUS"] = true
-BUSES["AMIGA_KEYBOARD"] = true
BUSES["ARCADIA"] = true
BUSES["ASTROCADE"] = true
BUSES["ATA"] = true
-BUSES["BBC_FDC"] = true
+BUSES["BBC_1MHZBUS"] = true
BUSES["BBC_ANALOGUE"] = true
BUSES["BBC_CART"] = true
BUSES["BBC_EXP"] = true
+BUSES["BBC_FDC"] = true
BUSES["BBC_INTERNAL"] = true
BUSES["BBC_JOYPORT"] = true
BUSES["BBC_MODEM"] = true
-BUSES["BBC_1MHZBUS"] = true
+BUSES["BBC_ROM"] = true
BUSES["BBC_TUBE"] = true
BUSES["BBC_USERPORT"] = true
-BUSES["BBC_ROM"] = true
BUSES["BML3"] = true
BUSES["BW2"] = true
BUSES["C64"] = true
@@ -861,8 +861,8 @@ BUSES["CGENIE_EXPANSION"] = true
BUSES["CGENIE_PARALLEL"] = true
BUSES["CHANNELF"] = true
BUSES["COCO"] = true
-BUSES["COLECO_CONTROLLER"] = true
BUSES["COLECO_CART"] = true
+BUSES["COLECO_CONTROLLER"] = true
BUSES["COMPIS_GRAPHICS"] = true
BUSES["COMPUCOLOR"] = true
BUSES["COMX35"] = true
@@ -871,10 +871,10 @@ BUSES["CRVISION"] = true
BUSES["DMV"] = true
BUSES["ECBBUS"] = true
BUSES["ECONET"] = true
-BUSES["EKARA"] = true
BUSES["EINSTEIN_USERPORT"] = true
-BUSES["ELECTRON"] = true
+BUSES["EKARA"] = true
BUSES["ELECTRON_CART"] = true
+BUSES["ELECTRON"] = true
BUSES["EP64"] = true
BUSES["EPSON_SIO"] = true
BUSES["FMT_SCSI"] = true
@@ -885,38 +885,39 @@ BUSES["GBA"] = true
BUSES["GENERIC"] = true
BUSES["GIO64"] = true
BUSES["HEXBUS"] = true
-BUSES["HPHIL"] = true
+BUSES["HP_IPC_IO"] = true
+BUSES["HP80_IO"] = true
+BUSES["HP9845_IO"] = true
BUSES["HPDIO"] = true
+BUSES["HPHIL"] = true
BUSES["IEEE488"] = true
BUSES["IMI7000"] = true
BUSES["INTELLEC4"] = true
-BUSES["INTERPRO_SR"] = true
BUSES["INTERPRO_KEYBOARD"] = true
BUSES["INTERPRO_MOUSE"] = true
-BUSES["INTV"] = true
+BUSES["INTERPRO_SR"] = true
BUSES["INTV_CTRL"] = true
+BUSES["INTV"] = true
BUSES["IQ151"] = true
BUSES["ISA"] = true
BUSES["ISBX"] = true
BUSES["JAKKS_GAMEKEY"] = true
-BUSES["HP80_IO"] = true
-BUSES["HP9845_IO"] = true
-BUSES["HP_IPC_IO"] = true
BUSES["KC"] = true
BUSES["LPCI"] = true
BUSES["M5"] = true
BUSES["MACKBD"] = true
BUSES["MACPDS"] = true
-BUSES["MIDI"] = true
+BUSES["MC10"] = true
BUSES["MEGADRIVE"] = true
+BUSES["MIDI"] = true
BUSES["MSX_SLOT"] = true
BUSES["MTX"] = true
BUSES["MULTIBUS"] = true
BUSES["NASBUS"] = true
-BUSES["NEOGEO"] = true
BUSES["NEOGEO_CTRL"] = true
-BUSES["NES"] = true
+BUSES["NEOGEO"] = true
BUSES["NES_CTRL"] = true
+BUSES["NES"] = true
BUSES["NEWBRAIN"] = true
BUSES["NSCSI"] = true
BUSES["NUBUS"] = true
@@ -924,18 +925,18 @@ BUSES["O2"] = true
BUSES["ORICEXT"] = true
BUSES["P2000"] = true
BUSES["PASOPIA"] = true
-BUSES["PC1512"] = true
-BUSES["PCE"] = true
BUSES["PC_JOY"] = true
BUSES["PC_KBD"] = true
+BUSES["PC1512"] = true
+BUSES["PCE"] = true
BUSES["PET"] = true
BUSES["PLUS4"] = true
BUSES["POFO"] = true
BUSES["PSI_KEYBOARD"] = true
BUSES["PSX_CONTROLLER"] = true
BUSES["PSX_PARALLEL"] = true
-BUSES["QL"] = true
BUSES["QBUS"] = true
+BUSES["QL"] = true
BUSES["RS232"] = true
BUSES["RTPC_KBD"] = true
BUSES["S100"] = true
@@ -954,8 +955,8 @@ BUSES["SG1000_EXP"] = true
BUSES["SGIKBD"] = true
BUSES["SMS_CTRL"] = true
BUSES["SMS_EXP"] = true
-BUSES["SNES"] = true
BUSES["SNES_CTRL"] = true
+BUSES["SNES"] = true
BUSES["SPC1000"] = true
BUSES["SPECTRUM"] = true
BUSES["SS50"] = true
@@ -966,11 +967,11 @@ BUSES["SVI_SLOT"] = true
BUSES["TANBUS"] = true
BUSES["TATUNG_PIPE"] = true
BUSES["THOMSON"] = true
-BUSES["TMC600"] = true
BUSES["TI8X"] = true
BUSES["TI99"] = true
BUSES["TI99X"] = true
BUSES["TIKI100"] = true
+BUSES["TMC600"] = true
BUSES["TVC"] = true
BUSES["UTS_KBD"] = true
BUSES["VBOY"] = true
@@ -1570,6 +1571,8 @@ files {
MAME_DIR .. "src/mame/machine/315-5881_crypt.h",
MAME_DIR .. "src/mame/machine/315-6154.cpp",
MAME_DIR .. "src/mame/machine/315-6154.h",
+ MAME_DIR .. "src/mame/machine/segashiobd.cpp",
+ MAME_DIR .. "src/mame/machine/segashiobd.h",
MAME_DIR .. "src/mame/video/powervr2.cpp",
MAME_DIR .. "src/mame/video/powervr2.h",
MAME_DIR .. "src/mame/drivers/neogeo.cpp",
@@ -1894,6 +1897,7 @@ files {
MAME_DIR .. "src/mame/audio/lynx.h",
MAME_DIR .. "src/mame/machine/lynx.cpp",
MAME_DIR .. "src/mame/drivers/pofo.cpp",
+ MAME_DIR .. "src/mame/machine/pofo_kbd.cpp",
MAME_DIR .. "src/mame/drivers/tvboy.cpp",
}
@@ -4404,6 +4408,8 @@ files {
createMESSProjects(_target, _subtarget, "yamaha")
files {
MAME_DIR .. "src/mame/machine/mulcd.cpp",
+ MAME_DIR .. "src/mame/drivers/yman1x.cpp",
+ MAME_DIR .. "src/mame/drivers/ymdx100.cpp",
MAME_DIR .. "src/mame/drivers/ymdx11.cpp",
MAME_DIR .. "src/mame/drivers/ymmu5.cpp",
MAME_DIR .. "src/mame/drivers/ymmu50.cpp",
@@ -4411,6 +4417,7 @@ files {
MAME_DIR .. "src/mame/drivers/ymmu100.cpp",
MAME_DIR .. "src/mame/drivers/ympsr60.cpp",
MAME_DIR .. "src/mame/drivers/ympsr340.cpp",
+ MAME_DIR .. "src/mame/drivers/ymsy35.cpp",
MAME_DIR .. "src/mame/drivers/ymtx81z.cpp",
MAME_DIR .. "src/mame/drivers/ymvl70.cpp",
MAME_DIR .. "src/mame/drivers/fb01.cpp",
@@ -4581,6 +4588,7 @@ files {
MAME_DIR .. "src/mame/drivers/learnwin.cpp",
MAME_DIR .. "src/mame/drivers/lft.cpp",
MAME_DIR .. "src/mame/drivers/lg-dvd.cpp",
+ MAME_DIR .. "src/mame/drivers/lk3000.cpp",
MAME_DIR .. "src/mame/drivers/lms46.cpp",
MAME_DIR .. "src/mame/drivers/lola8a.cpp",
MAME_DIR .. "src/mame/drivers/lilith.cpp",