summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/extlib.lua6
-rw-r--r--scripts/src/3rdparty.lua8
-rw-r--r--scripts/src/bus.lua44
-rw-r--r--scripts/src/cpu.lua22
-rw-r--r--scripts/src/emu.lua1
-rw-r--r--scripts/src/formats.lua12
-rw-r--r--scripts/src/lib.lua1
-rw-r--r--scripts/src/machine.lua4
-rw-r--r--scripts/src/netlist.lua41
-rw-r--r--scripts/src/osd/modules.lua4
-rw-r--r--scripts/src/osd/sdl.lua3
-rw-r--r--scripts/src/sound.lua20
-rw-r--r--scripts/src/video.lua37
-rw-r--r--scripts/target/mame/arcade.lua95
-rw-r--r--scripts/target/mame/mess.lua43
15 files changed, 251 insertions, 90 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua
index a3949e3447b..674f1b1d881 100644
--- a/scripts/extlib.lua
+++ b/scripts/extlib.lua
@@ -14,6 +14,7 @@ local extlibs = {
portmidi = { "portmidi", "3rdparty/portmidi/pm_common" },
portaudio = { "portaudio", "3rdparty/portaudio/include" },
lua = { "lua", "3rdparty/lua/src" },
+ utf8proc = { "utf8proc", "3rdparty/utf8proc" },
}
-- system lib options
@@ -57,6 +58,11 @@ newoption {
description = "Use system LUA library",
}
+newoption {
+ trigger = "with-system-utf8proc",
+ description = "Use system utf8proc library",
+}
+
-- build helpers
function ext_lib(lib)
local opt = _OPTIONS["with-system-" .. lib]
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 13904e80377..e5b64df3ac0 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -917,14 +917,14 @@ project "portaudio"
"/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
"/wd4127", -- warning C4127: conditional expression is constant
}
- if _OPTIONS["vs"]=="intel-15" then
+ if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd869", -- remark #869: parameter "xxx" was never referenced
"/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
"/Qwd2544", -- message #2544: empty dependent statement in if-statement
"/Qwd1879", -- warning #1879: unimplemented pragma ignored
}
- end
+ end
configuration { "vs2015*" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -1608,9 +1608,9 @@ project "utf8proc"
kind "StaticLib"
defines {
- "UTF8PROC_DLLEXPORT="
+ "UTF8PROC_DLLEXPORT="
}
-
+
configuration "Debug"
defines {
"verbose=-1",
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 7c6aa7a8167..9902d41b3b5 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -428,6 +428,8 @@ if (BUSES["C64"]~=null) then
MAME_DIR .. "src/devices/bus/c64/silverrock.h",
MAME_DIR .. "src/devices/bus/c64/simons_basic.cpp",
MAME_DIR .. "src/devices/bus/c64/simons_basic.h",
+ MAME_DIR .. "src/devices/bus/c64/speakeasy.cpp",
+ MAME_DIR .. "src/devices/bus/c64/speakeasy.h",
MAME_DIR .. "src/devices/bus/c64/stardos.cpp",
MAME_DIR .. "src/devices/bus/c64/stardos.h",
MAME_DIR .. "src/devices/bus/c64/std.cpp",
@@ -1425,6 +1427,8 @@ if (BUSES["VIC20"]~=null) then
MAME_DIR .. "src/devices/bus/vic20/vic1112.h",
MAME_DIR .. "src/devices/bus/vic20/vic1210.cpp",
MAME_DIR .. "src/devices/bus/vic20/vic1210.h",
+ MAME_DIR .. "src/devices/bus/vic20/speakeasy.cpp",
+ MAME_DIR .. "src/devices/bus/vic20/speakeasy.h",
MAME_DIR .. "src/devices/bus/vic20/user.cpp",
MAME_DIR .. "src/devices/bus/vic20/user.h",
MAME_DIR .. "src/devices/bus/vic20/4cga.cpp",
@@ -1493,16 +1497,18 @@ end
if (BUSES["VME"]~=null) then
files {
- MAME_DIR .. "src/devices/bus/vme/vme.cpp",
- MAME_DIR .. "src/devices/bus/vme/vme.h",
- MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.cpp",
- MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.h",
- MAME_DIR .. "src/devices/bus/vme/vme_mvme350.cpp",
- MAME_DIR .. "src/devices/bus/vme/vme_mvme350.h",
- MAME_DIR .. "src/devices/bus/vme/vme_fcisio.cpp",
- MAME_DIR .. "src/devices/bus/vme/vme_fcisio.h",
- MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.cpp",
- MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.h",
+ MAME_DIR .. "src/devices/bus/vme/vme.cpp",
+ MAME_DIR .. "src/devices/bus/vme/vme.h",
+ MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.cpp",
+ MAME_DIR .. "src/devices/bus/vme/vme_mzr8300.h",
+ MAME_DIR .. "src/devices/bus/vme/vme_mvme350.cpp",
+ MAME_DIR .. "src/devices/bus/vme/vme_mvme350.h",
+ MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.cpp",
+ MAME_DIR .. "src/devices/bus/vme/vme_fccpu20.h",
+ MAME_DIR .. "src/devices/bus/vme/vme_fcisio.cpp",
+ MAME_DIR .. "src/devices/bus/vme/vme_fcisio.h",
+ MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.cpp",
+ MAME_DIR .. "src/devices/bus/vme/vme_fcscsi.h",
}
end
@@ -2645,6 +2651,24 @@ end
---------------------------------------------------
--
+--@src/devices/bus/amiga/keyboard/keyboard.h,BUSES["AMIGA_KEYBOARD"] = true
+---------------------------------------------------
+
+if (BUSES["AMIGA_KEYBOARD"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/keyboard.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/keyboard.h",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/matrix.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/matrix.h",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/a1200.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/a1200.h",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/a500.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/keyboard/a500.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/amiga/zorro/zorro.h,BUSES["ZORRO"] = true
---------------------------------------------------
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 802d582448c..477dac60840 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -425,7 +425,8 @@ end
if (CPUS["COP400"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop410ds.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop420ds.cpp")
- table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop440ds.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop444ds.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop424ds.cpp")
end
--------------------------------------------------
@@ -611,7 +612,6 @@ if (CPUS["HCD62121"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.cpp",
MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.h",
- MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121_ops.h",
}
end
@@ -1339,6 +1339,8 @@ if (CPUS["M6805"]~=null) then
MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx",
MAME_DIR .. "src/devices/cpu/m6805/m68705.cpp",
MAME_DIR .. "src/devices/cpu/m6805/m68705.h",
+ MAME_DIR .. "src/devices/cpu/m6805/m68hc05.cpp",
+ MAME_DIR .. "src/devices/cpu/m6805/m68hc05.h",
}
end
@@ -2415,3 +2417,19 @@ end
if (CPUS["MB86901"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sparc/sparcdasm.cpp")
end
+
+--------------------------------------------------
+-- Intergraph CLIPPER (C100/C300/C400) series
+--@src/devices/cpu/clipper/clipper.h,CPUS["CLIPPER"] = true
+--------------------------------------------------
+
+if (CPUS["CLIPPER"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/clipper/clipper.cpp",
+ MAME_DIR .. "src/devices/cpu/clipper/clipper.h",
+ }
+end
+
+if (CPUS["CLIPPER"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/clipper/clipperd.cpp")
+end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 44b67a338ae..62d33a18eb9 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -128,6 +128,7 @@ files {
MAME_DIR .. "src/emu/ioport.cpp",
MAME_DIR .. "src/emu/ioport.h",
MAME_DIR .. "src/emu/inpttype.h",
+ MAME_DIR .. "src/emu/logmacro.h",
MAME_DIR .. "src/emu/machine.cpp",
MAME_DIR .. "src/emu/machine.h",
MAME_DIR .. "src/emu/mconfig.cpp",
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua
index 4606137b17c..994633e26b2 100644
--- a/scripts/src/formats.lua
+++ b/scripts/src/formats.lua
@@ -211,6 +211,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/apd_dsk.h,FORMATS["APD_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["APD_DSK"]~=null or _OPTIONS["with-tools"]) then
+ files {
+ MAME_DIR.. "src/lib/formats/apd_dsk.cpp",
+ MAME_DIR.. "src/lib/formats/apd_dsk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/apf_apt.h,FORMATS["APF_APT"] = true
--------------------------------------------------
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index e102ba3cdcc..9c631aebbab 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -22,6 +22,7 @@ project "utils"
ext_includedir("expat"),
ext_includedir("zlib"),
ext_includedir("flac"),
+ ext_includedir("utf8proc"),
}
files {
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index b4db9d9dcce..8e33f586b68 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -260,10 +260,10 @@ end
---------------------------------------------------
--
---@src/devices/machine/68561mpcc.h,MACHINES += 68561MPCC
+--@src/devices/machine/68561mpcc.h,MACHINES["MPCC68561"] = true
---------------------------------------------------
-if (MACHINES["68561MPCC"]~=null) then
+if (MACHINES["MPCC68561"]~=null) then
files {
MAME_DIR .. "src/devices/machine/68561mpcc.cpp",
MAME_DIR .. "src/devices/machine/68561mpcc.h",
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 089148c2d18..4fc5a6ed27b 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -28,26 +28,28 @@ project "netlist"
}
files {
- MAME_DIR .. "src/lib/netlist/nl_base.cpp",
- MAME_DIR .. "src/lib/netlist/nl_base.h",
+ MAME_DIR .. "src/lib/netlist/nl_base.cpp",
+ MAME_DIR .. "src/lib/netlist/nl_base.h",
MAME_DIR .. "src/lib/netlist/nl_config.h",
- MAME_DIR .. "src/lib/netlist/nl_errstr.h",
+ MAME_DIR .. "src/lib/netlist/nl_errstr.h",
MAME_DIR .. "src/lib/netlist/nl_dice_compat.h",
- MAME_DIR .. "src/lib/netlist/nl_factory.cpp",
- MAME_DIR .. "src/lib/netlist/nl_factory.h",
+ MAME_DIR .. "src/lib/netlist/nl_factory.cpp",
+ MAME_DIR .. "src/lib/netlist/nl_factory.h",
MAME_DIR .. "src/lib/netlist/nl_lists.h",
MAME_DIR .. "src/lib/netlist/nl_parser.cpp",
MAME_DIR .. "src/lib/netlist/nl_parser.h",
MAME_DIR .. "src/lib/netlist/nl_setup.cpp",
MAME_DIR .. "src/lib/netlist/nl_setup.h",
- MAME_DIR .. "src/lib/netlist/nl_time.h",
+ MAME_DIR .. "src/lib/netlist/nl_time.h",
MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
MAME_DIR .. "src/lib/netlist/plib/palloc.cpp",
MAME_DIR .. "src/lib/netlist/plib/palloc.h",
MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp",
MAME_DIR .. "src/lib/netlist/plib/pchrono.h",
- MAME_DIR .. "src/lib/netlist/plib/pexception.cpp",
- MAME_DIR .. "src/lib/netlist/plib/pexception.h",
+ MAME_DIR .. "src/lib/netlist/plib/pexception.cpp",
+ MAME_DIR .. "src/lib/netlist/plib/pexception.h",
+ MAME_DIR .. "src/lib/netlist/plib/pfunction.cpp",
+ MAME_DIR .. "src/lib/netlist/plib/pfunction.h",
MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
MAME_DIR .. "src/lib/netlist/plib/plists.h",
@@ -57,6 +59,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/poptions.h",
MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
MAME_DIR .. "src/lib/netlist/plib/pparser.h",
+ MAME_DIR .. "src/lib/netlist/plib/ppmf.h",
MAME_DIR .. "src/lib/netlist/plib/pstate.cpp",
MAME_DIR .. "src/lib/netlist/plib/pstate.h",
MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
@@ -72,17 +75,19 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/tools/nl_convert.h",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.h",
- MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.cpp",
- MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h",
+ MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.cpp",
+ MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.h",
+ MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h",
MAME_DIR .. "src/lib/netlist/analog/nld_switches.cpp",
MAME_DIR .. "src/lib/netlist/analog/nld_switches.h",
- MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.cpp",
+ MAME_DIR .. "src/lib/netlist/analog/nlid_twoterm.cpp",
+ MAME_DIR .. "src/lib/netlist/analog/nlid_twoterm.h",
MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.h",
MAME_DIR .. "src/lib/netlist/analog/nld_opamps.cpp",
MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.h",
- MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp",
+ MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp",
MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
@@ -187,14 +192,14 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_log.h",
MAME_DIR .. "src/lib/netlist/devices/nld_system.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_system.h",
- MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp",
- MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h",
+ MAME_DIR .. "src/lib/netlist/devices/nlid_truthtable.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nlid_truthtable.h",
MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h",
MAME_DIR .. "src/lib/netlist/devices/nlid_system.h",
- MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp",
- MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h",
- MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp",
- MAME_DIR .. "src/lib/netlist/macro/nlm_base.h",
+ MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h",
+ MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp",
+ MAME_DIR .. "src/lib/netlist/macro/nlm_base.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp",
MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index ce9977d8dd6..9ca2bcaa196 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -221,6 +221,10 @@ function osdmodulesbuild()
defines {
"NO_USE_PORTAUDIO",
}
+ else
+ includedirs {
+ ext_includedir("portaudio"),
+ }
end
if _OPTIONS["NO_USE_MIDI"]=="1" then
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index af6ff1b98ce..5970f6d3334 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -113,7 +113,8 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "mingw*" or "vs*" }
targetprefix "sdl"
links {
- "psapi"
+ "psapi",
+ "Ole32",
}
configuration { }
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index ab05c06847c..171ad3f30cc 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -154,13 +154,13 @@ end
---------------------------------------------------
-- Amiga audio hardware
---@src/devices/sound/amiga.h,SOUNDS["AMIGA"] = true
+--@src/devices/machine/8364_paula.h,SOUNDS["PAULA_8364"] = true
---------------------------------------------------
-if (SOUNDS["AMIGA"]~=null) then
+if (SOUNDS["PAULA_8364"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/amiga.cpp",
- MAME_DIR .. "src/devices/sound/amiga.h",
+ MAME_DIR .. "src/devices/machine/8364_paula.cpp",
+ MAME_DIR .. "src/devices/machine/8364_paula.h",
}
end
@@ -1424,3 +1424,15 @@ if (SOUNDS["MM5837"]~=null) then
MAME_DIR .. "src/devices/sound/mm5837.h",
}
end
+
+---------------------------------------------------
+-- Intelligent Designs DAVE
+--@src/devices/sound/dave.h,MACHINES["DAVE"] = true
+---------------------------------------------------
+
+if (SOUNDS["DAVE"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/dave.cpp",
+ MAME_DIR .. "src/devices/sound/dave.h",
+ }
+end
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index 0bda85053a7..770de5db893 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -330,6 +330,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/hlcd0515.h,VIDEOS["HLCD0515"] = true
+--------------------------------------------------
+
+if (VIDEOS["HLCD0515"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/hlcd0515.cpp",
+ MAME_DIR .. "src/devices/video/hlcd0515.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/huc6202.h,VIDEOS["HUC6202"] = true
--------------------------------------------------
@@ -378,6 +390,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/huc6271.h,VIDEOS["HUC6271"] = true
+--------------------------------------------------
+
+if (VIDEOS["HUC6271"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/huc6271.cpp",
+ MAME_DIR .. "src/devices/video/huc6271.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/huc6272.h,VIDEOS["HUC6272"] = true
--------------------------------------------------
@@ -912,3 +936,16 @@ if (VIDEOS["EF9369"]~=null) then
MAME_DIR .. "src/devices/video/ef9369.h",
}
end
+
+--------------------------------------------------
+--
+--@src/devices/video/ppu2c0x.h,VIDEOS["PPU2C0X"] = true
+--------------------------------------------------
+
+if (VIDEOS["PPU2C0X"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/ppu2c0x.cpp",
+ MAME_DIR .. "src/devices/video/ppu2c0x.h",
+ }
+end
+
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 3cd5b7c020d..8c7f713f6f9 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -163,7 +163,7 @@ SOUNDS["SN76496"] = true
SOUNDS["POKEY"] = true
SOUNDS["TIA"] = true
SOUNDS["NES_APU"] = true
-SOUNDS["AMIGA"] = true
+SOUNDS["PAULA_8364"] = true
SOUNDS["ASTROCADE"] = true
SOUNDS["NAMCO"] = true
SOUNDS["NAMCO_15XX"] = true
@@ -265,6 +265,7 @@ SOUNDS["VOLT_REG"] = true
--SOUNDS["MEA8000"] = true
SOUNDS["DAC76"] = true
SOUNDS["MM5837"] = true
+--SOUNDS["DAVE"] = true
--------------------------------------------------
-- specify available video cores
@@ -296,6 +297,7 @@ VIDEOS["HD44780"] = true
VIDEOS["HD61830"] = true
VIDEOS["HD63484"] = true
--VIDEOS["HD66421"] = true
+--VIDEOS["HLCD0515"] = true
VIDEOS["HUC6202"] = true
VIDEOS["HUC6260"] = true
--VIDEOS["HUC6261"] = true
@@ -338,6 +340,7 @@ VIDEOS["V9938"] = true
VIDEOS["VOODOO"] = true
VIDEOS["VOODOO_PCI"] = true
VIDEOS["ZEUS2"] = true
+VIDEOS["PPU2C0X"] = true
--------------------------------------------------
-- specify available machine cores
@@ -351,7 +354,7 @@ MACHINES["TPI6525"] = true
MACHINES["RIOT6532"] = true
MACHINES["6821PIA"] = true
MACHINES["6840PTM"] = true
---MACHINES["68561MPCC"] = true
+--MACHINES["MPCC68561"] = true
MACHINES["ACIA6850"] = true
MACHINES["68681"] = true
MACHINES["7200FIFO"] = true
@@ -726,6 +729,7 @@ function linkProjects_mame_arcade(_target, _subtarget)
"dooyong",
"dynax",
"edevices",
+ "efo",
"eolith",
"excelent",
"exidy",
@@ -767,6 +771,7 @@ function linkProjects_mame_arcade(_target, _subtarget)
"pce",
"phoenix",
"playmark",
+ "promat",
"psikyo",
"ramtek",
"rare",
@@ -788,6 +793,7 @@ function linkProjects_mame_arcade(_target, _subtarget)
"tecfri",
"technos",
"tehkan",
+ "terminal",
"thepit",
"toaplan",
"tong",
@@ -795,9 +801,9 @@ function linkProjects_mame_arcade(_target, _subtarget)
"univers",
"upl",
"valadon",
- "veltmjr",
"venture",
"vsystem",
+ "wing",
"yunsung",
"zaccaria",
"misc",
@@ -1664,6 +1670,18 @@ files {
MAME_DIR .. "src/mame/drivers/twins.cpp",
}
+createMAMEProjects(_target, _subtarget, "efo")
+files {
+ MAME_DIR .. "src/mame/drivers/cedar_magnet.cpp",
+ MAME_DIR .. "src/mame/machine/cedar_magnet_plane.cpp",
+ MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.cpp",
+ MAME_DIR .. "src/mame/machine/cedar_magnet_board.cpp",
+ MAME_DIR .. "src/mame/machine/cedar_magnet_flop.cpp",
+ MAME_DIR .. "src/mame/drivers/cidelsa.cpp",
+ MAME_DIR .. "src/mame/includes/cidelsa.h",
+ MAME_DIR .. "src/mame/video/cidelsa.cpp",
+}
+
createMAMEProjects(_target, _subtarget, "eolith")
files {
MAME_DIR .. "src/mame/drivers/eolith.cpp",
@@ -1687,6 +1705,7 @@ files {
MAME_DIR .. "src/mame/video/excellent_spr.cpp",
MAME_DIR .. "src/mame/video/excellent_spr.h",
MAME_DIR .. "src/mame/drivers/lastbank.cpp",
+ MAME_DIR .. "src/mame/drivers/witch.cpp",
}
createMAMEProjects(_target, _subtarget, "exidy")
@@ -2717,6 +2736,9 @@ files {
MAME_DIR .. "src/mame/drivers/crgolf.cpp",
MAME_DIR .. "src/mame/includes/crgolf.h",
MAME_DIR .. "src/mame/video/crgolf.cpp",
+ MAME_DIR .. "src/mame/drivers/himesiki.cpp",
+ MAME_DIR .. "src/mame/includes/himesiki.h",
+ MAME_DIR .. "src/mame/video/himesiki.cpp",
MAME_DIR .. "src/mame/drivers/suprgolf.cpp",
}
@@ -2852,10 +2874,6 @@ files {
MAME_DIR .. "src/mame/includes/vsnes.h",
MAME_DIR .. "src/mame/machine/vsnes.cpp",
MAME_DIR .. "src/mame/video/vsnes.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.h",
-
-
}
createMAMEProjects(_target, _subtarget, "nix")
@@ -2996,6 +3014,13 @@ files {
MAME_DIR .. "src/mame/video/sslam.cpp",
}
+createMAMEProjects(_target, _subtarget, "promat")
+files {
+ MAME_DIR .. "src/mame/drivers/1945kiii.cpp",
+ MAME_DIR .. "src/mame/drivers/3x3puzzl.cpp",
+ MAME_DIR .. "src/mame/drivers/gstream.cpp",
+}
+
createMAMEProjects(_target, _subtarget, "psikyo")
files {
MAME_DIR .. "src/mame/drivers/psikyo.cpp",
@@ -3363,6 +3388,8 @@ files {
MAME_DIR .. "src/mame/video/rdpblend.h",
MAME_DIR .. "src/mame/video/rdptpipe.cpp",
MAME_DIR .. "src/mame/video/rdptpipe.h",
+ MAME_DIR .. "src/mame/video/pin64.cpp",
+ MAME_DIR .. "src/mame/video/pin64.h",
MAME_DIR .. "src/mame/drivers/hanaawas.cpp",
MAME_DIR .. "src/mame/includes/hanaawas.h",
MAME_DIR .. "src/mame/video/hanaawas.cpp",
@@ -3666,7 +3693,6 @@ files {
MAME_DIR .. "src/mame/video/rastan.cpp",
MAME_DIR .. "src/mame/drivers/retofinv.cpp",
MAME_DIR .. "src/mame/includes/retofinv.h",
- MAME_DIR .. "src/mame/machine/retofinv.cpp",
MAME_DIR .. "src/mame/video/retofinv.cpp",
MAME_DIR .. "src/mame/drivers/rollrace.cpp",
MAME_DIR .. "src/mame/includes/rollrace.h",
@@ -3938,6 +3964,15 @@ files {
MAME_DIR .. "src/mame/video/wc90b.cpp",
}
+createMAMEProjects(_target, _subtarget, "terminal")
+files {
+ MAME_DIR .. "src/mame/drivers/istrebiteli.cpp",
+ MAME_DIR .. "src/mame/drivers/tiamc1.cpp",
+ MAME_DIR .. "src/mame/includes/tiamc1.h",
+ MAME_DIR .. "src/mame/video/tiamc1.cpp",
+ MAME_DIR .. "src/mame/audio/tiamc1.cpp",
+}
+
createMAMEProjects(_target, _subtarget, "thepit")
files {
MAME_DIR .. "src/mame/drivers/thepit.cpp",
@@ -4048,12 +4083,6 @@ files {
MAME_DIR .. "src/mame/video/tankbust.cpp",
}
-createMAMEProjects(_target, _subtarget, "veltmjr")
-files {
- MAME_DIR .. "src/mame/drivers/cardline.cpp",
- MAME_DIR .. "src/mame/drivers/witch.cpp",
-}
-
createMAMEProjects(_target, _subtarget, "venture")
files {
MAME_DIR .. "src/mame/drivers/looping.cpp",
@@ -4117,6 +4146,17 @@ files {
MAME_DIR .. "src/mame/video/welltris.cpp",
}
+createMAMEProjects(_target, _subtarget, "wing")
+files {
+ MAME_DIR .. "src/mame/drivers/lucky74.cpp",
+ MAME_DIR .. "src/mame/includes/lucky74.h",
+ MAME_DIR .. "src/mame/video/lucky74.cpp",
+ MAME_DIR .. "src/mame/drivers/luckgrln.cpp",
+ MAME_DIR .. "src/mame/drivers/pinkiri8.cpp",
+ MAME_DIR .. "src/mame/drivers/slotcarn.cpp",
+ MAME_DIR .. "src/mame/drivers/superwng.cpp",
+}
+
createMAMEProjects(_target, _subtarget, "yunsung")
files {
MAME_DIR .. "src/mame/drivers/nmg5.cpp",
@@ -4280,13 +4320,11 @@ includedirs {
}
files {
- MAME_DIR .. "src/mame/drivers/1945kiii.cpp",
MAME_DIR .. "src/mame/drivers/39in1.cpp",
MAME_DIR .. "src/mame/machine/pxa255.h",
MAME_DIR .. "src/mame/drivers/3do.cpp",
MAME_DIR .. "src/mame/includes/3do.h",
MAME_DIR .. "src/mame/machine/3do.cpp",
- MAME_DIR .. "src/mame/drivers/3x3puzzl.cpp",
MAME_DIR .. "src/mame/drivers/4enraya.cpp",
MAME_DIR .. "src/mame/includes/4enraya.h",
MAME_DIR .. "src/mame/video/4enraya.cpp",
@@ -4334,6 +4372,7 @@ files {
MAME_DIR .. "src/mame/drivers/calomega.cpp",
MAME_DIR .. "src/mame/includes/calomega.h",
MAME_DIR .. "src/mame/video/calomega.cpp",
+ MAME_DIR .. "src/mame/drivers/cardline.cpp",
MAME_DIR .. "src/mame/drivers/carrera.cpp",
MAME_DIR .. "src/mame/drivers/castle.cpp",
MAME_DIR .. "src/mame/drivers/cave.cpp",
@@ -4352,19 +4391,11 @@ files {
MAME_DIR .. "src/mame/machine/cdislave.h",
MAME_DIR .. "src/mame/machine/cdicdic.cpp",
MAME_DIR .. "src/mame/machine/cdicdic.h",
- MAME_DIR .. "src/mame/drivers/cedar_magnet.cpp",
- MAME_DIR .. "src/mame/machine/cedar_magnet_plane.cpp",
- MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.cpp",
- MAME_DIR .. "src/mame/machine/cedar_magnet_board.cpp",
- MAME_DIR .. "src/mame/machine/cedar_magnet_flop.cpp",
MAME_DIR .. "src/mame/drivers/cesclass.cpp",
MAME_DIR .. "src/mame/drivers/chance32.cpp",
MAME_DIR .. "src/mame/drivers/chexx.cpp",
MAME_DIR .. "src/mame/drivers/chicago.cpp",
MAME_DIR .. "src/mame/drivers/chsuper.cpp",
- MAME_DIR .. "src/mame/drivers/cidelsa.cpp",
- MAME_DIR .. "src/mame/includes/cidelsa.h",
- MAME_DIR .. "src/mame/video/cidelsa.cpp",
MAME_DIR .. "src/mame/drivers/clowndwn.cpp",
MAME_DIR .. "src/mame/drivers/cocoloco.cpp",
MAME_DIR .. "src/mame/drivers/coinmstr.cpp",
@@ -4446,7 +4477,6 @@ files {
MAME_DIR .. "src/mame/drivers/gotcha.cpp",
MAME_DIR .. "src/mame/includes/gotcha.h",
MAME_DIR .. "src/mame/video/gotcha.cpp",
- MAME_DIR .. "src/mame/drivers/gstream.cpp",
MAME_DIR .. "src/mame/drivers/gumbo.cpp",
MAME_DIR .. "src/mame/includes/gumbo.h",
MAME_DIR .. "src/mame/video/gumbo.cpp",
@@ -4456,9 +4486,6 @@ files {
MAME_DIR .. "src/mame/drivers/hazelgr.cpp",
MAME_DIR .. "src/mame/drivers/headonb.cpp",
MAME_DIR .. "src/mame/drivers/highvdeo.cpp",
- MAME_DIR .. "src/mame/drivers/himesiki.cpp",
- MAME_DIR .. "src/mame/includes/himesiki.h",
- MAME_DIR .. "src/mame/video/himesiki.cpp",
MAME_DIR .. "src/mame/drivers/hitpoker.cpp",
MAME_DIR .. "src/mame/drivers/homedata.cpp",
MAME_DIR .. "src/mame/includes/homedata.h",
@@ -4469,7 +4496,6 @@ files {
MAME_DIR .. "src/mame/drivers/imolagp.cpp",
MAME_DIR .. "src/mame/drivers/intrscti.cpp",
MAME_DIR .. "src/mame/drivers/istellar.cpp",
- MAME_DIR .. "src/mame/drivers/istrebiteli.cpp",
MAME_DIR .. "src/mame/drivers/itgambl2.cpp",
MAME_DIR .. "src/mame/drivers/itgambl3.cpp",
MAME_DIR .. "src/mame/drivers/itgamble.cpp",
@@ -4499,10 +4525,6 @@ files {
MAME_DIR .. "src/mame/video/lethalj.cpp",
MAME_DIR .. "src/mame/drivers/limenko.cpp",
MAME_DIR .. "src/mame/drivers/ltcasino.cpp",
- MAME_DIR .. "src/mame/drivers/lucky74.cpp",
- MAME_DIR .. "src/mame/includes/lucky74.h",
- MAME_DIR .. "src/mame/video/lucky74.cpp",
- MAME_DIR .. "src/mame/drivers/luckgrln.cpp",
MAME_DIR .. "src/mame/drivers/magic10.cpp",
MAME_DIR .. "src/mame/drivers/magicard.cpp",
MAME_DIR .. "src/mame/drivers/magicfly.cpp",
@@ -4569,7 +4591,6 @@ files {
MAME_DIR .. "src/mame/video/pk8000.cpp",
MAME_DIR .. "src/mame/drivers/photon2.cpp",
MAME_DIR .. "src/mame/drivers/photoply.cpp",
- MAME_DIR .. "src/mame/drivers/pinkiri8.cpp",
MAME_DIR .. "src/mame/drivers/pipeline.cpp",
MAME_DIR .. "src/mame/drivers/pkscram.cpp",
MAME_DIR .. "src/mame/drivers/pntnpuzl.cpp",
@@ -4607,7 +4628,6 @@ files {
MAME_DIR .. "src/mame/drivers/skyarmy.cpp",
MAME_DIR .. "src/mame/drivers/skylncr.cpp",
MAME_DIR .. "src/mame/drivers/sliver.cpp",
- MAME_DIR .. "src/mame/drivers/slotcarn.cpp",
MAME_DIR .. "src/mame/drivers/smsmcorp.cpp",
MAME_DIR .. "src/mame/drivers/sothello.cpp",
MAME_DIR .. "src/mame/drivers/splus.cpp",
@@ -4625,7 +4645,6 @@ files {
MAME_DIR .. "src/mame/drivers/sumt8035.cpp",
MAME_DIR .. "src/mame/drivers/supercrd.cpp",
MAME_DIR .. "src/mame/drivers/supertnk.cpp",
- MAME_DIR .. "src/mame/drivers/superwng.cpp",
MAME_DIR .. "src/mame/drivers/tapatune.cpp",
MAME_DIR .. "src/mame/drivers/tattack.cpp",
MAME_DIR .. "src/mame/drivers/taxidriv.cpp",
@@ -4636,10 +4655,6 @@ files {
MAME_DIR .. "src/mame/drivers/thedeep.cpp",
MAME_DIR .. "src/mame/includes/thedeep.h",
MAME_DIR .. "src/mame/video/thedeep.cpp",
- MAME_DIR .. "src/mame/drivers/tiamc1.cpp",
- MAME_DIR .. "src/mame/includes/tiamc1.h",
- MAME_DIR .. "src/mame/video/tiamc1.cpp",
- MAME_DIR .. "src/mame/audio/tiamc1.cpp",
MAME_DIR .. "src/mame/drivers/tickee.cpp",
MAME_DIR .. "src/mame/drivers/tmspoker.cpp",
MAME_DIR .. "src/mame/drivers/truco.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 31b9117e1f7..052a99d2527 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -134,6 +134,7 @@ CPUS["HPHYBRID"] = true
CPUS["SM510"] = true
CPUS["MB86901"] = true
CPUS["NANOPROCESSOR"] = true
+CPUS["CLIPPER"] = true
--------------------------------------------------
-- specify available sound cores; some of these are
@@ -167,7 +168,7 @@ SOUNDS["SN76496"] = true
SOUNDS["POKEY"] = true
SOUNDS["TIA"] = true
SOUNDS["NES_APU"] = true
-SOUNDS["AMIGA"] = true
+SOUNDS["PAULA_8364"] = true
SOUNDS["ASTROCADE"] = true
--SOUNDS["NAMCO"] = true
--SOUNDS["NAMCO_15XX"] = true
@@ -266,6 +267,7 @@ SOUNDS["VOLT_REG"] = true
SOUNDS["MEA8000"] = true
--SOUNDS["DAC76"] = true
--SOUNDS["MM5837"] = true
+SOUNDS["DAVE"] = true
--------------------------------------------------
-- specify available video cores
@@ -296,10 +298,12 @@ VIDEOS["HD44780"] = true
VIDEOS["HD61830"] = true
--VIDEOS+= HD63484"] = true
VIDEOS["HD66421"] = true
+VIDEOS["HLCD0515"] = true
VIDEOS["HUC6202"] = true
VIDEOS["HUC6260"] = true
VIDEOS["HUC6261"] = true
VIDEOS["HUC6270"] = true
+VIDEOS["HUC6271"] = true
VIDEOS["HUC6272"] = true
VIDEOS["I8244"] = true
VIDEOS["I82730"] = true
@@ -341,6 +345,7 @@ VIDEOS["SCN2674"] = true
VIDEOS["GB_LCD"] = true
VIDEOS["GBA_LCD"] = true
VIDEOS["MGA2064W"] = true
+VIDEOS["PPU2C0X"] = true
--------------------------------------------------
-- specify available machine cores
@@ -354,7 +359,7 @@ MACHINES["GAYLE"] = true
MACHINES["6522VIA"] = true
MACHINES["6821PIA"] = true
MACHINES["6840PTM"] = true
-MACHINES["68561MPCC"] = true
+MACHINES["MPCC68561"] = true
MACHINES["68681"] = true
MACHINES["7200FIFO"] = true
MACHINES["8530SCC"] = true
@@ -607,6 +612,7 @@ BUSES["ADAMNET"] = true
BUSES["APF"] = true
BUSES["APRICOT_EXPANSION"] = true
BUSES["APRICOT_KEYBOARD"] = true
+BUSES["AMIGA_KEYBOARD"] = true
BUSES["ARCADIA"] = true
BUSES["ASTROCADE"] = true
BUSES["BBC_FDC"] = true
@@ -729,6 +735,7 @@ FORMATS["ADAM_DSK"] = true
FORMATS["AFS_DSK"] = true
FORMATS["AMI_DSK"] = true
FORMATS["AP2_DSK"] = true
+FORMATS["APD_DSK"] = true
FORMATS["APF_APT"] = true
FORMATS["APOLLO_DSK"] = true
FORMATS["APPLIX_DSK"] = true
@@ -942,6 +949,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"ibm6580",
"imp",
"intel",
+ "interpro",
"interton",
"intv",
"isc",
@@ -1152,8 +1160,6 @@ files {
MAME_DIR .. "src/mame/machine/kabuki.cpp",
MAME_DIR .. "src/mame/machine/kabuki.h",
MAME_DIR .. "src/mame/video/pk8000.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
- MAME_DIR .. "src/mame/video/ppu2c0x.h",
MAME_DIR .. "src/mame/machine/snes.cpp",
MAME_DIR .. "src/mame/audio/snes_snd.cpp",
MAME_DIR .. "src/mame/audio/snes_snd.h",
@@ -1166,6 +1172,8 @@ files {
MAME_DIR .. "src/mame/video/rdpblend.h",
MAME_DIR .. "src/mame/video/rdptpipe.cpp",
MAME_DIR .. "src/mame/video/rdptpipe.h",
+ MAME_DIR .. "src/mame/video/pin64.cpp",
+ MAME_DIR .. "src/mame/video/pin64.h",
MAME_DIR .. "src/mame/machine/megadriv.cpp",
MAME_DIR .. "src/mame/drivers/naomi.cpp",
MAME_DIR .. "src/mame/includes/naomi.h",
@@ -1326,8 +1334,6 @@ createMESSProjects(_target, _subtarget, "amiga")
files {
MAME_DIR .. "src/mame/drivers/amiga.cpp",
MAME_DIR .. "src/mame/includes/amiga.h",
- MAME_DIR .. "src/mame/machine/amigakbd.cpp",
- MAME_DIR .. "src/mame/machine/amigakbd.h",
}
createMESSProjects(_target, _subtarget, "amstrad")
@@ -1836,8 +1842,6 @@ files {
createMESSProjects(_target, _subtarget, "enterprise")
files {
MAME_DIR .. "src/mame/drivers/ep64.cpp",
- MAME_DIR .. "src/mame/audio/dave.cpp",
- MAME_DIR .. "src/mame/audio/dave.h",
MAME_DIR .. "src/mame/video/nick.cpp",
MAME_DIR .. "src/mame/video/nick.h",
}
@@ -1896,7 +1900,7 @@ files {
createMESSProjects(_target, _subtarget, "fidelity")
files {
MAME_DIR .. "src/mame/drivers/fidelz80.cpp",
- MAME_DIR .. "src/mame/includes/fidelz80.h",
+ MAME_DIR .. "src/mame/includes/fidelbase.h",
MAME_DIR .. "src/mame/drivers/fidel6502.cpp",
MAME_DIR .. "src/mame/drivers/fidel68k.cpp",
}
@@ -2072,6 +2076,22 @@ files {
MAME_DIR .. "src/mame/drivers/tim100.cpp",
}
+createMESSProjects(_target, _subtarget, "interpro")
+files {
+ MAME_DIR .. "src/mame/drivers/interpro.cpp",
+ MAME_DIR .. "src/mame/includes/interpro.h",
+ MAME_DIR .. "src/mame/machine/cammu.h",
+ MAME_DIR .. "src/mame/machine/cammu.cpp",
+ MAME_DIR .. "src/mame/machine/interpro_ioga.h",
+ MAME_DIR .. "src/mame/machine/interpro_ioga.cpp",
+ MAME_DIR .. "src/mame/machine/interpro_ioga.h",
+ MAME_DIR .. "src/mame/machine/interpro_ioga.cpp",
+ MAME_DIR .. "src/mame/machine/interpro_mcga.h",
+ MAME_DIR .. "src/mame/machine/interpro_mcga.cpp",
+ MAME_DIR .. "src/mame/machine/interpro_sga.h",
+ MAME_DIR .. "src/mame/machine/interpro_sga.cpp",
+}
+
createMESSProjects(_target, _subtarget, "interton")
files {
MAME_DIR .. "src/mame/drivers/vc4000.cpp",
@@ -2379,6 +2399,8 @@ files {
MAME_DIR .. "src/mame/drivers/mk1.cpp",
MAME_DIR .. "src/mame/drivers/mk2.cpp",
MAME_DIR .. "src/mame/drivers/novag6502.cpp",
+ MAME_DIR .. "src/mame/drivers/novagbase.h",
+ MAME_DIR .. "src/mame/drivers/novag68k.cpp",
MAME_DIR .. "src/mame/drivers/ssystem3.cpp",
MAME_DIR .. "src/mame/includes/ssystem3.h",
MAME_DIR .. "src/mame/video/ssystem3.cpp",
@@ -3419,6 +3441,9 @@ files {
MAME_DIR .. "src/mame/includes/xor100.h",
MAME_DIR .. "src/mame/drivers/xavix.cpp",
MAME_DIR .. "src/mame/drivers/zorba.cpp",
+ MAME_DIR .. "src/mame/includes/zorba.h",
+ MAME_DIR .. "src/mame/machine/zorbakbd.cpp",
+ MAME_DIR .. "src/mame/machine/zorbakbd.h",
}
end