summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/complay.py157
-rw-r--r--scripts/genie.lua2
-rw-r--r--scripts/src/3rdparty.lua29
-rw-r--r--scripts/src/bus.lua22
-rw-r--r--scripts/src/cpu.lua13
-rw-r--r--scripts/src/emu.lua1
-rw-r--r--scripts/src/lib.lua3
-rw-r--r--scripts/src/machine.lua33
-rw-r--r--scripts/src/main.lua8
-rw-r--r--scripts/src/mame/frontend.lua2
-rw-r--r--scripts/src/netlist.lua19
-rw-r--r--scripts/src/sound.lua4
-rw-r--r--scripts/target/mame/arcade.lua10
-rw-r--r--scripts/target/mame/ci.lua8
-rw-r--r--scripts/target/mame/mess.lua17
-rw-r--r--scripts/target/mame/nl.lua22
-rw-r--r--scripts/target/mame/tiny.lua10
-rw-r--r--scripts/target/zexall/zexall.lua2
18 files changed, 288 insertions, 74 deletions
diff --git a/scripts/build/complay.py b/scripts/build/complay.py
index 34a43992b7c..6903418e242 100755
--- a/scripts/build/complay.py
+++ b/scripts/build/complay.py
@@ -96,7 +96,7 @@ class LayoutChecker(Minifyer):
BADTAGPATTERN = re.compile('[^abcdefghijklmnopqrstuvwxyz0123456789_.:^$]')
VARPATTERN = re.compile('^.*~[0-9A-Za-z_]+~.*$')
FLOATCHARS = re.compile('^.*[.eE].*$')
- SHAPES = frozenset(('disk', 'dotmatrix', 'dotmatrix5dot', 'dotmatrixdot', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'led8seg_gts1', 'rect'))
+ SHAPES = frozenset(('disk', 'led14seg', 'led14segsc', 'led16seg', 'led16segsc', 'led7seg', 'led8seg_gts1', 'rect'))
ORIENTATIONS = frozenset((0, 90, 180, 270))
YESNO = frozenset(('yes', 'no'))
BLENDMODES = frozenset(('none', 'alpha', 'multiply', 'add'))
@@ -225,6 +225,8 @@ class LayoutChecker(Minifyer):
bottom = self.checkFloatAttribute('bounds', attrs, 'bottom', 1.0)
x = self.checkFloatAttribute('bounds', attrs, 'x', 0.0)
y = self.checkFloatAttribute('bounds', attrs, 'y', 0.0)
+ xc = self.checkFloatAttribute('bounds', attrs, 'xc', 0.0)
+ yc = self.checkFloatAttribute('bounds', attrs, 'yc', 0.0)
width = self.checkFloatAttribute('bounds', attrs, 'width', 1.0)
height = self.checkFloatAttribute('bounds', attrs, 'height', 1.0)
if (left is not None) and (right is not None) and (left > right):
@@ -239,12 +241,14 @@ class LayoutChecker(Minifyer):
self.handleError('Element bounds attribute width "%s" is negative' % (attrs['width'], ))
if (height is not None) and (0.0 > height):
self.handleError('Element bounds attribute height "%s" is negative' % (attrs['height'], ))
- if ('left' not in attrs) and ('x' not in attrs):
- self.handleError('Element bounds has neither attribute left nor attribute x')
- has_ltrb = ('left' in attrs) or ('top' in attrs) or ('right' in attrs) or ('bottom' in attrs)
- has_origin_size = ('x' in attrs) or ('y' in attrs) or ('width' in attrs) or ('height' in attrs)
- if has_ltrb and has_origin_size:
- self.handleError('Element bounds has both left/top/right/bottom and origin/size attributes')
+ if (('left' in attrs) and (('x' in attrs) or ('xc' in attrs))) or (('x' in attrs) and ('xc' in attrs)):
+ self.handleError('Element bounds has multiple horizontal origin attributes (left/x/xc)')
+ if (('left' in attrs) and ('width' in attrs)) or ((('x' in attrs) or ('xc' in attrs)) and ('right' in attrs)):
+ self.handleError('Element bounds has both left/right and x/xc/width attributes')
+ if (('top' in attrs) and (('y' in attrs) or ('yc' in attrs))) or (('y' in attrs) and ('yc' in attrs)):
+ self.handleError('Element bounds has multiple vertical origin attributes (top/y/yc)')
+ if (('top' in attrs) and ('height' in attrs)) or ((('y' in attrs) or ('yc' in attrs)) and ('bottom' in attrs)):
+ self.handleError('Element bounds has both top/bottom and y/yc/height attributes')
def checkOrientation(self, attrs):
if self.have_orientation[-1]:
@@ -287,15 +291,42 @@ class LayoutChecker(Minifyer):
self.handleError('Element %s attribute state "%s" is negative' % (name, attrs['state']))
if (statemask is not None) and (stateval & ~statemask):
self.handleError('Element %s attribute state "%s" has bits set that are clear in attribute statemask "%s"' % (name, attrs['state'], attrs['statemask']))
- self.handlers.append((self.componentStartHandler, self.componentEndHandler))
+ if 'image' == name:
+ self.handlers.append((self.imageComponentStartHandler, self.imageComponentEndHandler))
+ else:
+ self.handlers.append((self.componentStartHandler, self.componentEndHandler))
self.have_bounds.append({ })
self.have_color.append({ })
- def startObject(self):
- self.handlers.append((self.objectStartHandler, self.objectEndHandler))
- self.have_bounds.append(None)
+ def checkViewItem(self, name, attrs):
+ if ('blend' in attrs) and (attrs['blend'] not in self.BLENDMODES) and not self.VARPATTERN.match(attrs['blend']):
+ self.handleError('Element %s attribute blend "%s" is unsupported' % (name, attrs['blend']))
+ if 'inputtag' in attrs:
+ if 'inputmask' not in attrs:
+ self.handleError('Element %s has inputtag attribute without inputmask attribute' % (name, ))
+ self.checkTag(attrs['inputtag'], name, 'inputtag')
+ elif 'inputmask' in attrs:
+ self.handleError('Element %s has inputmask attribute without inputtag attribute' % (name, ))
+ inputraw = None
+ if 'inputraw' in attrs:
+ if (attrs['inputraw'] not in self.YESNO) and (not self.VARPATTERN.match(attrs['inputraw'])):
+ self.handleError('Element %s attribute inputraw "%s" is not "yes" or "no"' % (name, attrs['inputraw']))
+ else:
+ inputraw = 'yes' == attrs['inputraw']
+ if 'inputmask' not in attrs:
+ self.handleError('Element %s has inputraw attribute without inputmask attribute' % (name, ))
+ if 'inputtag' not in attrs:
+ self.handleError('Element %s has inputraw attribute without inputtag attribute' % (name, ))
+ inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None)
+ if (inputmask is not None) and (not inputmask):
+ if (inputraw is None) or (not inputraw):
+ self.handleError('Element %s attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
+
+ def startViewItem(self, name):
+ self.handlers.append((self.viewItemStartHandler, self.viewItemEndHandler))
+ self.have_bounds.append(None if 'group' == name else { })
self.have_orientation.append(False)
- self.have_color.append(None)
+ self.have_color.append(None if 'group' == name else { })
def rootStartHandler(self, name, attrs):
if 'mamelayout' != name:
@@ -420,8 +451,8 @@ class LayoutChecker(Minifyer):
self.handleError('Element simplecounter attribute align "%s" not in valid range 0-2' % (attrs['align'], ))
self.checkComponent(name, attrs)
elif 'image' == name:
- if 'file' not in attrs:
- self.handleError('Element image missing attribute file')
+ self.have_file = 'file' in attrs
+ self.have_data = None
self.checkComponent(name, attrs)
elif 'reel' == name:
# TODO: validate symbollist and improve validation of other attributes
@@ -471,35 +502,33 @@ class LayoutChecker(Minifyer):
self.have_color.pop()
self.handlers.pop()
+ def imageComponentStartHandler(self, name, attrs):
+ if 'data' == name:
+ if self.have_data is not None:
+ self.handleError('Element image has multiple data child elements (previous %s)' % (self.have_data))
+ else:
+ self.have_data = self.formatLocation()
+ if self.have_file:
+ self.handleError('Element image has attribute file and child element data')
+ self.ignored_depth = 1
+ else:
+ self.componentStartHandler(name, attrs)
+
+ def imageComponentEndHandler(self, name):
+ if (not self.have_file) and (self.have_data is None):
+ self.handleError('Element image missing attribute file or child element data')
+ del self.have_file
+ del self.have_data
+ self.componentEndHandler(name)
+
def groupViewStartHandler(self, name, attrs):
if 'element' == name:
if 'ref' not in attrs:
self.handleError('Element %s missing attribute ref' % (name, ))
elif attrs['ref'] not in self.referenced_elements:
self.referenced_elements[attrs['ref']] = self.formatLocation()
- if ('blend' in attrs) and (attrs['blend'] not in self.BLENDMODES) and not self.VARPATTERN.match(attrs['blend']):
- self.handleError('Element %s attribute blend "%s" is unsupported' % (name, attrs['blend']))
- if 'inputtag' in attrs:
- if 'inputmask' not in attrs:
- self.handleError('Element %s has inputtag attribute without inputmask attribute' % (name, ))
- self.checkTag(attrs['inputtag'], name, 'inputtag')
- elif 'inputmask' in attrs:
- self.handleError('Element %s has inputmask attribute without inputtag attribute' % (name, ))
- inputraw = None
- if 'inputraw' in attrs:
- if (attrs['inputraw'] not in self.YESNO) and (not self.VARPATTERN.match(attrs['inputraw'])):
- self.handleError('Element %s attribute inputraw "%s" is not "yes" or "no"' % (name, attrs['inputraw']))
- else:
- inputraw = 'yes' == attrs['inputraw']
- if 'inputmask' not in attrs:
- self.handleError('Element %s has inputraw attribute without inputmask attribute' % (name, ))
- if 'inputtag' not in attrs:
- self.handleError('Element %s has inputraw attribute without inputtag attribute' % (name, ))
- inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None)
- if (inputmask is not None) and (0 == inputmask):
- if (inputraw is None) or (0 == inputraw):
- self.handleError('Element %s attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
- self.startObject();
+ self.checkViewItem(name, attrs)
+ self.startViewItem(name)
elif 'screen' == name:
if 'index' in attrs:
index = self.checkIntAttribute(name, attrs, 'index', None)
@@ -512,7 +541,8 @@ class LayoutChecker(Minifyer):
self.checkTag(tag, name, 'tag')
if self.BADTAGPATTERN.search(tag):
self.handleError('Element screen attribute tag "%s" contains invalid characters' % (tag, ))
- self.startObject();
+ self.checkViewItem(name, attrs)
+ self.startViewItem(name)
elif 'group' == name:
if 'ref' not in attrs:
self.handleError('Element group missing attribute ref')
@@ -525,7 +555,7 @@ class LayoutChecker(Minifyer):
self.current_collections[n] = l
else:
self.handleError('Element group instantiates collection with duplicate name "%s" from %s (previous %s)' % (n, l, self.current_collections[n]))
- self.startObject();
+ self.startViewItem(name)
elif 'repeat' == name:
if 'count' not in attrs:
self.handleError('Element repeat missing attribute count')
@@ -577,24 +607,55 @@ class LayoutChecker(Minifyer):
self.have_bounds.pop()
self.handlers.pop()
- def objectStartHandler(self, name, attrs):
- if 'bounds' == name:
- if self.have_bounds[-1] is not None:
- self.handleError('Duplicate element bounds (previous %s)' % (self.have_bounds[-1], ))
+ def viewItemStartHandler(self, name, attrs):
+ if 'animate' == name:
+ if isinstance(self.have_bounds[-1], dict):
+ if 'inputtag' in attrs:
+ if 'name' in attrs:
+ self.handleError('Element animate has both attribute inputtag and attribute name')
+ self.checkTag(attrs['inputtag'], name, 'inputtag')
+ elif 'name' not in attrs:
+ self.handleError('Element animate has neither attribute inputtag nor attribute name')
+ self.checkIntAttribute(name, attrs, 'mask', None)
else:
+ self.handleError('Encountered unexpected element %s' % (name, ))
+ elif 'bounds' == name:
+ if self.have_bounds[-1] is None:
self.have_bounds[-1] = self.formatLocation()
+ elif isinstance(self.have_bounds[-1], dict):
+ state = self.checkIntAttribute(name, attrs, 'state', 0)
+ if state is not None:
+ if 0 > state:
+ self.handleError('Element bounds attribute state "%s" is negative' % (attrs['state'], ))
+ if state in self.have_bounds[-1]:
+ self.handleError('Duplicate bounds for state %d (previous %s)' % (state, self.have_bounds[-1][state]))
+ else:
+ self.have_bounds[-1][state] = self.formatLocation()
+ else:
+ self.handleError('Duplicate element bounds (previous %s)' % (self.have_bounds[-1], ))
self.checkBounds(attrs)
elif 'orientation' == name:
self.checkOrientation(attrs)
- if 'color' == name:
- if self.have_color[-1] is not None:
- self.handleError('Duplicate element color (previous %s)' % (self.have_color[-1], ))
- else:
+ elif 'color' == name:
+ if self.have_color[-1] is None:
self.have_color[-1] = self.formatLocation()
+ elif isinstance(self.have_color[-1], dict):
+ state = self.checkIntAttribute(name, attrs, 'state', 0)
+ if state is not None:
+ if 0 > state:
+ self.handleError('Element color attribute state "%s" is negative' % (attrs['state'], ))
+ if state in self.have_color[-1]:
+ self.handleError('Duplicate color for state %d (previous %s)' % (state, self.have_color[-1][state]))
+ else:
+ self.have_color[-1][state] = self.formatLocation()
+ else:
+ self.handleError('Duplicate element color (previous %s)' % (self.have_color[-1], ))
self.checkColor(attrs)
+ else:
+ self.handleError('Encountered unexpected element %s' % (name, ))
self.ignored_depth = 1
- def objectEndHandler(self, name):
+ def viewItemEndHandler(self, name):
self.have_bounds.pop()
self.have_orientation.pop()
self.have_color.pop()
diff --git a/scripts/genie.lua b/scripts/genie.lua
index b8655c0c24b..5310e003ed8 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1173,7 +1173,7 @@ configuration { "asmjs" }
buildoptions_cpp {
"-std=c++14",
"-s DISABLE_EXCEPTION_CATCHING=2",
- "-s EXCEPTION_CATCHING_WHITELIST=\"['_ZN15running_machine17start_all_devicesEv','_ZN12cli_frontend7executeEiPPc','_ZN8chd_file11open_commonEb','_ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','_ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE']\"",
+ "-s EXCEPTION_CATCHING_WHITELIST=\"['_ZN15running_machine17start_all_devicesEv','_ZN12cli_frontend7executeEiPPc','_ZN8chd_file11open_commonEb','_ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','_ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE','_ZNK19netlist_mame_device19base_validity_checkER16validity_checker']\"",
}
linkoptions {
"-Wl,--start-group",
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index b3fc924eab4..27383c3a8ed 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -19,18 +19,21 @@ project "expat"
kind "StaticLib"
-- fake out the enough of expat_config.h to get by
+ -- could possibly add more defines here for specific targets
defines {
"HAVE_MEMMOVE",
"HAVE_STDINT_H",
"HAVE_STDLIB_H",
"HAVE_STRING_H",
+ "PACKAGE=\"expat\"",
"PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"",
"PACKAGE_NAME=\"expat\"",
- "PACKAGE_STRING=\"expat 2.1.1\"",
+ "PACKAGE_STRING=\"expat 2.2.10\"",
"PACKAGE_TARNAME=\"expat\"",
"PACKAGE_URL=\"\"",
- "PACKAGE_VERSION=\"2.1.1\"",
+ "PACKAGE_VERSION=\"2.2.10\"",
"STDC_HEADERS",
+ "VERSION=\"2.2.10\"",
"XML_CONTEXT_BYTES=1024",
"XML_DTD",
"XML_NS",
@@ -45,6 +48,22 @@ else
"BYTEORDER=1234",
}
end
+if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="freebsd" then
+ defines {
+ "HAVE_ARC4RANDOM",
+ }
+end
+if BASE_TARGETOS=="unix" then
+ defines {
+ "HAVE_DLFCN_H",
+ "HAVE_FCNTL_H",
+ "HAVE_MMAP",
+ "HAVE_SYS_STAT_H",
+ "HAVE_SYS_TYPES_H",
+ "HAVE_UNISTD_H",
+ "XML_DEV_URANDOM",
+ }
+end
configuration { "vs*" }
buildoptions {
@@ -1390,6 +1409,12 @@ end
end
end
+ if _OPTIONS["targetos"]=="freebsd" then
+ buildoptions {
+ backtick(pkgconfigcmd() .. " --cflags gl")
+ }
+ end
+
defines {
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index e2404cf1abf..eb1784a9c67 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -504,6 +504,8 @@ if (BUSES["BBC_1MHZBUS"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ieee488.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.h",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m5000.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m5000.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/multiform.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/multiform.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.cpp",
@@ -597,6 +599,8 @@ if (BUSES["BBC_USERPORT"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.h",
MAME_DIR .. "src/devices/bus/bbc/userport/lcd.cpp",
MAME_DIR .. "src/devices/bus/bbc/userport/lcd.h",
+ MAME_DIR .. "src/devices/bus/bbc/userport/m4000.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/userport/m4000.h",
MAME_DIR .. "src/devices/bus/bbc/userport/palext.cpp",
MAME_DIR .. "src/devices/bus/bbc/userport/palext.h",
MAME_DIR .. "src/devices/bus/bbc/userport/pointer.cpp",
@@ -1113,6 +1117,20 @@ end
---------------------------------------------------
--
+--@src/devices/bus/fmt_scsi/fmt_scsi.h,BUSES["FMT_SCSI"] = true
+---------------------------------------------------
+
+if (BUSES["FMT_SCSI"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/fmt_scsi/fmt_scsi.cpp",
+ MAME_DIR .. "src/devices/bus/fmt_scsi/fmt_scsi.h",
+ MAME_DIR .. "src/devices/bus/fmt_scsi/fmt121.cpp",
+ MAME_DIR .. "src/devices/bus/fmt_scsi/fmt121.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/gamate/slot.h,BUSES["GAMATE"] = true
---------------------------------------------------
@@ -2378,6 +2396,8 @@ if (BUSES["A2BUS"]~=null) then
MAME_DIR .. "src/devices/bus/a2bus/cmsscsi.h",
MAME_DIR .. "src/devices/bus/a2bus/uthernet.cpp",
MAME_DIR .. "src/devices/bus/a2bus/uthernet.h",
+ MAME_DIR .. "src/devices/bus/a2bus/sider.cpp",
+ MAME_DIR .. "src/devices/bus/a2bus/sider.h",
}
end
@@ -3867,6 +3887,8 @@ if (BUSES["VSMILE"]~=null) then
MAME_DIR .. "src/devices/bus/vsmile/vsmile_ctrl.h",
MAME_DIR .. "src/devices/bus/vsmile/pad.cpp",
MAME_DIR .. "src/devices/bus/vsmile/pad.h",
+ MAME_DIR .. "src/devices/bus/vsmile/mat.cpp",
+ MAME_DIR .. "src/devices/bus/vsmile/mat.h",
MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.cpp",
MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.h",
MAME_DIR .. "src/devices/bus/vsmile/rom.cpp",
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index a55cf443fdb..b1b068030fe 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1580,7 +1580,7 @@ if (CPUS["M6502"]~=null) then
{ MAME_DIR .. "src/devices/cpu/m6502/om65ce02.lst", GEN_DIR .. "emu/cpu/m6502/m65ce02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 disassembler source file...", PYTHON .. " $(1) s m65ce02 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 disassembler source file...", PYTHON .. " $(1) s m6509 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 disassembler source file...", PYTHON .. " $(1) s m6510 $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 disassembler source file...", PYTHON .. " $(1) s n2a03 $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 disassembler source file...", PYTHON .. " $(1) s n2a03_core $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm740.lst" }, {"@echo Generating m740 disassembler source file...", PYTHON .. " $(1) s m740 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", }, {"@echo Generating r65c02 disassembler source file...", PYTHON .. " $(1) s r65c02 - $(<) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/or65c19.lst", GEN_DIR .. "emu/cpu/m6502/r65c19.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dr65c19.lst" }, {"@echo Generating r65c19 disassembler source file...", PYTHON .. " $(1) s r65c19 $(<) $(2) $(@)" }},
@@ -3014,6 +3014,7 @@ if (CPUS["NS32000"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/ns32000/ns32000.cpp",
MAME_DIR .. "src/devices/cpu/ns32000/ns32000.h",
+ MAME_DIR .. "src/devices/cpu/ns32000/slave.h",
}
end
@@ -3319,3 +3320,13 @@ if (CPUS["UPD177X"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd177x/upd177xd.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd177x/upd177xd.h")
end
+
+--------------------------------------------------
+-- Sanyo LC58 - Disassembler only
+--@src/devices/cpu/lc58/lc58.h,CPUS["LC58"] = true
+--------------------------------------------------
+
+if (CPUS["LC58"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lc58/lc58d.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lc58/lc58d.h")
+end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 89c7d3ccd20..d65ea40c21d 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -181,6 +181,7 @@ files {
MAME_DIR .. "src/emu/recording.h",
MAME_DIR .. "src/emu/render.cpp",
MAME_DIR .. "src/emu/render.h",
+ MAME_DIR .. "src/emu/rendertypes.h",
MAME_DIR .. "src/emu/rendfont.cpp",
MAME_DIR .. "src/emu/rendfont.h",
MAME_DIR .. "src/emu/rendlay.cpp",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index a5ce6180857..edc68ee3c13 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -74,7 +74,10 @@ project "utils"
MAME_DIR .. "src/lib/util/jedparse.h",
MAME_DIR .. "src/lib/util/md5.cpp",
MAME_DIR .. "src/lib/util/md5.h",
+ MAME_DIR .. "src/lib/util/msdib.cpp",
+ MAME_DIR .. "src/lib/util/msdib.h",
MAME_DIR .. "src/lib/util/nanosvg.cpp",
+ MAME_DIR .. "src/lib/util/nanosvg.h",
MAME_DIR .. "src/lib/util/opresolv.cpp",
MAME_DIR .. "src/lib/util/opresolv.h",
MAME_DIR .. "src/lib/util/options.cpp",
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 600c22f2746..ac96f03e4cc 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -4546,3 +4546,36 @@ if (MACHINES["ALPHA_8921"]~=null) then
MAME_DIR .. "src/devices/machine/alpha_8921.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/machine/bl_handhelds_menucontrol.h,MACHINES["BL_HANDHELDS_MENUCONTROL"] = true
+---------------------------------------------------
+if (MACHINES["BL_HANDHELDS_MENUCONTROL"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/bl_handhelds_menucontrol.cpp",
+ MAME_DIR .. "src/devices/machine/bl_handhelds_menucontrol.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/ns32081.h,MACHINES["NS32081"] = true
+---------------------------------------------------
+if (MACHINES["NS32081"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/ns32081.cpp",
+ MAME_DIR .. "src/devices/machine/ns32081.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/ns32202.h,MACHINES["NS32202"] = true
+---------------------------------------------------
+if (MACHINES["NS32202"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/ns32202.cpp",
+ MAME_DIR .. "src/devices/machine/ns32202.h",
+ }
+end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 4d787bfbdaf..6ae28487563 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -151,10 +151,13 @@ end
.. " -s ALLOW_MEMORY_GROWTH=0"
.. " -s TOTAL_MEMORY=268435456"
.. " -s DISABLE_EXCEPTION_CATCHING=2"
- .. " -s EXCEPTION_CATCHING_WHITELIST=\"['__ZN15running_machine17start_all_devicesEv','__ZN12cli_frontend7executeEiPPc','__ZN8chd_file11open_commonEb','__ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','__ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE']\""
+ .. " -s EXCEPTION_CATCHING_WHITELIST=\"['__ZN15running_machine17start_all_devicesEv','__ZN12cli_frontend7executeEiPPc','__ZN8chd_file11open_commonEb','__ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','__ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE','__ZNK19netlist_mame_device19base_validity_checkER16validity_checker']\""
.. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__ZN15running_machine30emscripten_get_running_machineEv', '__ZN15running_machine17emscripten_get_uiEv', '__ZN15running_machine20emscripten_get_soundEv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio', '_SDL_SendKeyboardKey', '__ZN15running_machine15emscripten_saveEPKc', '__ZN15running_machine15emscripten_loadEPKc', '__ZN15running_machine21emscripten_hard_resetEv', '__ZN15running_machine21emscripten_soft_resetEv', '__ZN15running_machine15emscripten_exitEv']\""
.. " -s EXTRA_EXPORTED_RUNTIME_METHODS=\"['cwrap']\""
.. " -s ERROR_ON_UNDEFINED_SYMBOLS=0"
+ .. " -s USE_WEBGL2=1"
+ .. " -s LEGACY_GL_EMULATION=1"
+ .. " -s GL_UNSAFE_OPTS=0"
.. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js"
.. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js"
.. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains"
@@ -179,7 +182,8 @@ end
end
postbuildcommands {
- os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js",
+ --os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js",
+ os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".html",
}
end
diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua
index 8253bf439b5..04e06bd2b6e 100644
--- a/scripts/src/mame/frontend.lua
+++ b/scripts/src/mame/frontend.lua
@@ -121,6 +121,8 @@ files {
MAME_DIR .. "src/frontend/mame/ui/inifile.h",
MAME_DIR .. "src/frontend/mame/ui/inputmap.cpp",
MAME_DIR .. "src/frontend/mame/ui/inputmap.h",
+ MAME_DIR .. "src/frontend/mame/ui/keyboard.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/keyboard.h",
MAME_DIR .. "src/frontend/mame/ui/mainmenu.cpp",
MAME_DIR .. "src/frontend/mame/ui/mainmenu.h",
MAME_DIR .. "src/frontend/mame/ui/menu.cpp",
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 442074f0215..ff21a35cde3 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -32,7 +32,7 @@ project "netlist"
}
includedirs {
- -- MAME_DIR .. "src/lib",
+ -- MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/netlist",
}
@@ -81,6 +81,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pmain.cpp",
MAME_DIR .. "src/lib/netlist/plib/pmain.h",
MAME_DIR .. "src/lib/netlist/plib/pmath.h",
+ MAME_DIR .. "src/lib/netlist/plib/pmatrix_cr.h",
MAME_DIR .. "src/lib/netlist/plib/pmempool.h",
MAME_DIR .. "src/lib/netlist/plib/pmulti_threading.h",
MAME_DIR .. "src/lib/netlist/plib/pomp.h",
@@ -123,7 +124,6 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h",
- MAME_DIR .. "src/lib/netlist/solver/mat_cr.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_w.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h",
@@ -131,14 +131,17 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/net_lib.cpp",
MAME_DIR .. "src/lib/netlist/devices/net_lib.h",
MAME_DIR .. "src/lib/netlist/devices/nld_9316_base.hxx",
- MAME_DIR .. "src/lib/netlist/devices/nld_2102A.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_2102a.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_tms4800.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4006.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4013.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4017.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_4029.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_4042.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4053.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_4076.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4316.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp",
@@ -170,8 +173,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_74393.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74365.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74ls629.cpp",
- MAME_DIR .. "src/lib/netlist/devices/nld_82S16.cpp",
- MAME_DIR .. "src/lib/netlist/devices/nld_82S115.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82s16.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82s115.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_8277.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_9310.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_9316.cpp",
@@ -202,9 +205,9 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/macro/nlm_otheric_lib.cpp",
MAME_DIR .. "src/lib/netlist/macro/nlm_roms_lib.cpp",
- MAME_DIR .. "src/lib/netlist/macro/modules/nlmod_RTEST.cpp",
- MAME_DIR .. "src/lib/netlist/macro/modules/nlmod_NE556_DIP.cpp",
- MAME_DIR .. "src/lib/netlist/macro/modules/nlmod_ICL8038_DIP.cpp",
+ MAME_DIR .. "src/lib/netlist/macro/modules/nlmod_rtest.cpp",
+ MAME_DIR .. "src/lib/netlist/macro/modules/nlmod_ne556_dip.cpp",
+ MAME_DIR .. "src/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp",
MAME_DIR .. "src/lib/netlist/generated/static_solvers.cpp",
MAME_DIR .. "src/lib/netlist/generated/nld_devinc.h",
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index a49d74dbc9e..bcbc9749c4b 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -10,6 +10,8 @@
----------------------------------------------------------------------------
files {
+ MAME_DIR .. "src/devices/sound/flt_biquad.cpp",
+ MAME_DIR .. "src/devices/sound/flt_biquad.h",
MAME_DIR .. "src/devices/sound/flt_vol.cpp",
MAME_DIR .. "src/devices/sound/flt_vol.h",
MAME_DIR .. "src/devices/sound/flt_rc.cpp",
@@ -657,6 +659,8 @@ if (SOUNDS["NES_APU"]~=null) then
MAME_DIR .. "src/devices/sound/nes_apu.cpp",
MAME_DIR .. "src/devices/sound/nes_apu.h",
MAME_DIR .. "src/devices/sound/nes_defs.h",
+ MAME_DIR .. "src/devices/sound/nes_apu_vt.cpp",
+ MAME_DIR .. "src/devices/sound/nes_apu_vt.h",
}
end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 98d86d70a89..e1cc34196c4 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -542,7 +542,7 @@ MACHINES["MC6843"] = true
MACHINES["MC6846"] = true
MACHINES["MC6852"] = true
MACHINES["MC6854"] = true
---MACHINES["MC68328"] = true
+MACHINES["MC68328"] = true
MACHINES["MC68901"] = true
MACHINES["MCCS1850"] = true
MACHINES["M68307"] = true
@@ -823,6 +823,7 @@ BUSES["ZORRO"] = true
-- specify used file formats
--------------------------------------------------
+FORMATS["APOLLO_DSK"] = true
FORMATS["GUAB_DSK"] = true
FORMATS["AMI_DSK"] = true
FORMATS["SC3000_BIT"] = true
@@ -3607,6 +3608,10 @@ files {
MAME_DIR .. "src/mame/includes/vicdual.h",
MAME_DIR .. "src/mame/audio/vicdual.cpp",
MAME_DIR .. "src/mame/audio/vicdual.h",
+ MAME_DIR .. "src/mame/audio/nl_brdrline.cpp",
+ MAME_DIR .. "src/mame/audio/nl_brdrline.h",
+ MAME_DIR .. "src/mame/audio/nl_frogs.cpp",
+ MAME_DIR .. "src/mame/audio/nl_frogs.h",
MAME_DIR .. "src/mame/audio/vicdual-97271p.cpp",
MAME_DIR .. "src/mame/audio/vicdual-97271p.h",
MAME_DIR .. "src/mame/video/vicdual.cpp",
@@ -3620,8 +3625,6 @@ files {
MAME_DIR .. "src/mame/audio/invinco.h",
MAME_DIR .. "src/mame/audio/pulsar.cpp",
MAME_DIR .. "src/mame/audio/pulsar.h",
- MAME_DIR .. "src/mame/audio/tranqgun.cpp",
- MAME_DIR .. "src/mame/audio/tranqgun.h",
MAME_DIR .. "src/mame/drivers/zaxxon.cpp",
MAME_DIR .. "src/mame/includes/zaxxon.h",
MAME_DIR .. "src/mame/audio/zaxxon.cpp",
@@ -4799,6 +4802,7 @@ files {
MAME_DIR .. "src/mame/drivers/coinmstr.cpp",
MAME_DIR .. "src/mame/drivers/coinmvga.cpp",
MAME_DIR .. "src/mame/drivers/comebaby.cpp",
+ MAME_DIR .. "src/mame/drivers/cowtipping.cpp",
MAME_DIR .. "src/mame/drivers/crazybal.cpp",
MAME_DIR .. "src/mame/drivers/cromptons.cpp",
MAME_DIR .. "src/mame/drivers/cupidon.cpp",
diff --git a/scripts/target/mame/ci.lua b/scripts/target/mame/ci.lua
index d710f3a4ea9..d4f1014864d 100644
--- a/scripts/target/mame/ci.lua
+++ b/scripts/target/mame/ci.lua
@@ -120,8 +120,8 @@ function createProjects_mame_ci(_target, _subtarget)
}
files{
- MAME_DIR .. "src/mame/audio/nl_carpolo.h",
MAME_DIR .. "src/mame/audio/nl_carpolo.cpp",
+ MAME_DIR .. "src/mame/audio/nl_carpolo.h",
MAME_DIR .. "src/mame/drivers/carpolo.cpp",
MAME_DIR .. "src/mame/includes/carpolo.h",
MAME_DIR .. "src/mame/machine/carpolo.cpp",
@@ -138,10 +138,10 @@ files{
MAME_DIR .. "src/mame/audio/exidy440.cpp",
MAME_DIR .. "src/mame/audio/exidy440.h",
MAME_DIR .. "src/mame/drivers/starfire.cpp",
- MAME_DIR .. "src/mame/audio/nl_fireone.h",
MAME_DIR .. "src/mame/audio/nl_fireone.cpp",
- MAME_DIR .. "src/mame/audio/nl_starfire.h",
+ MAME_DIR .. "src/mame/audio/nl_fireone.h",
MAME_DIR .. "src/mame/audio/nl_starfire.cpp",
+ MAME_DIR .. "src/mame/audio/nl_starfire.h",
MAME_DIR .. "src/mame/includes/starfire.h",
MAME_DIR .. "src/mame/video/starfire.cpp",
MAME_DIR .. "src/mame/drivers/vertigo.cpp",
@@ -165,6 +165,8 @@ files{
MAME_DIR .. "src/mame/audio/williams.cpp",
MAME_DIR .. "src/mame/audio/williams.h",
MAME_DIR .. "src/mame/video/williams.cpp",
+ MAME_DIR .. "src/mame/audio/s11c_bg.cpp",
+ MAME_DIR .. "src/mame/audio/s11c_bg.h",
MAME_DIR .. "src/mame/drivers/gaelco.cpp",
MAME_DIR .. "src/mame/includes/gaelco.h",
MAME_DIR .. "src/mame/video/gaelco.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index cc704293f0f..1401795fd94 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -779,6 +779,9 @@ MACHINES["XC1700E"] = true
MACHINES["EDLC"] = true
MACHINES["WTL3132"] = true
MACHINES["CXD1185"] = true
+MACHINES["BL_HANDHELDS_MENUCONTROL"] = true
+MACHINES["NS32081"] = true
+MACHINES["NS32202"] = true
--------------------------------------------------
-- specify available bus cores
@@ -839,6 +842,7 @@ BUSES["ELECTRON"] = true
BUSES["ELECTRON_CART"] = true
BUSES["EP64"] = true
BUSES["EPSON_SIO"] = true
+BUSES["FMT_SCSI"] = true
BUSES["GAMATE"] = true
BUSES["GAMEBOY"] = true
BUSES["GAMEGEAR"] = true
@@ -1167,6 +1171,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"cccp",
"cce",
"ccs",
+ "ceres",
"chessking",
"chromatics",
"chrysler",
@@ -1747,6 +1752,7 @@ files {
MAME_DIR .. "src/mame/machine/lisa.cpp",
MAME_DIR .. "src/mame/drivers/lwriter.cpp",
MAME_DIR .. "src/mame/drivers/mac128.cpp",
+ MAME_DIR .. "src/mame/drivers/macquadra700.cpp",
MAME_DIR .. "src/mame/drivers/mac.cpp",
MAME_DIR .. "src/mame/includes/mac.h",
MAME_DIR .. "src/mame/machine/egret.cpp",
@@ -1862,10 +1868,8 @@ files {
MAME_DIR .. "src/mame/drivers/rx78.cpp",
MAME_DIR .. "src/mame/drivers/tamag1.cpp",
MAME_DIR .. "src/mame/drivers/wswan.cpp",
- MAME_DIR .. "src/mame/includes/wswan.h",
MAME_DIR .. "src/mame/audio/wswan.cpp",
MAME_DIR .. "src/mame/audio/wswan.h",
- MAME_DIR .. "src/mame/machine/wswan.cpp",
MAME_DIR .. "src/mame/video/wswan.cpp",
MAME_DIR .. "src/mame/video/wswan.h",
MAME_DIR .. "src/mame/drivers/bandai_design_master.cpp",
@@ -2018,6 +2022,11 @@ files {
MAME_DIR .. "src/mame/drivers/ccs2810.cpp",
}
+createMESSProjects(_target, _subtarget, "ceres")
+files {
+ MAME_DIR .. "src/mame/drivers/ceres.cpp",
+}
+
createMESSProjects(_target, _subtarget, "chessking")
files {
MAME_DIR .. "src/mame/drivers/cking_master.cpp",
@@ -2609,6 +2618,8 @@ files {
MAME_DIR .. "src/mame/drivers/informer_213.cpp",
MAME_DIR .. "src/mame/machine/informer_207_376_kbd.cpp",
MAME_DIR .. "src/mame/machine/informer_207_376_kbd.h",
+ MAME_DIR .. "src/mame/machine/informer_213_kbd.cpp",
+ MAME_DIR .. "src/mame/machine/informer_213_kbd.h",
}
createMESSProjects(_target, _subtarget, "intel")
@@ -4024,6 +4035,7 @@ files {
MAME_DIR .. "src/mame/machine/generalplus_gpl16250.cpp",
MAME_DIR .. "src/mame/machine/generalplus_gpl16250.h",
MAME_DIR .. "src/mame/drivers/generalplus_gpl32612.cpp",
+ MAME_DIR .. "src/mame/drivers/generalplus_gpl162xx_lcdtype.cpp",
MAME_DIR .. "src/mame/drivers/generalplus_gpl_unknown.cpp",
MAME_DIR .. "src/mame/drivers/xavix.cpp",
MAME_DIR .. "src/mame/includes/xavix.h",
@@ -4281,6 +4293,7 @@ files {
MAME_DIR .. "src/mame/drivers/aaa.cpp",
MAME_DIR .. "src/mame/drivers/acd.cpp",
MAME_DIR .. "src/mame/drivers/aceex.cpp",
+ MAME_DIR .. "src/mame/drivers/adacp150.cpp",
MAME_DIR .. "src/mame/drivers/aid80f.cpp",
MAME_DIR .. "src/mame/drivers/akaiax80.cpp",
MAME_DIR .. "src/mame/drivers/alcat7100.cpp",
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index 1124c49b641..15306b6d881 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -288,6 +288,28 @@ files{
MAME_DIR .. "src/mame/machine/nl_palestra.cpp",
MAME_DIR .. "src/mame/machine/nl_palestra.h",
+ MAME_DIR .. "src/mame/drivers/vicdual.cpp",
+ MAME_DIR .. "src/mame/includes/vicdual.h",
+ MAME_DIR .. "src/mame/audio/vicdual.cpp",
+ MAME_DIR .. "src/mame/audio/vicdual.h",
+ MAME_DIR .. "src/mame/audio/nl_brdrline.cpp",
+ MAME_DIR .. "src/mame/audio/nl_brdrline.h",
+ MAME_DIR .. "src/mame/audio/nl_frogs.cpp",
+ MAME_DIR .. "src/mame/audio/nl_frogs.h",
+ MAME_DIR .. "src/mame/audio/vicdual-97271p.cpp",
+ MAME_DIR .. "src/mame/audio/vicdual-97271p.h",
+ MAME_DIR .. "src/mame/video/vicdual.cpp",
+ MAME_DIR .. "src/mame/video/vicdual-97269pb.cpp",
+ MAME_DIR .. "src/mame/video/vicdual-97269pb.h",
+ MAME_DIR .. "src/mame/audio/carnival.cpp",
+ MAME_DIR .. "src/mame/audio/carnival.h",
+ MAME_DIR .. "src/mame/audio/depthch.cpp",
+ MAME_DIR .. "src/mame/audio/depthch.h",
+ MAME_DIR .. "src/mame/audio/invinco.cpp",
+ MAME_DIR .. "src/mame/audio/invinco.h",
+ MAME_DIR .. "src/mame/audio/pulsar.cpp",
+ MAME_DIR .. "src/mame/audio/pulsar.h",
+
MAME_DIR .. "src/mame/machine/segacrpt_device.cpp",
MAME_DIR .. "src/mame/machine/segacrpt_device.h",
MAME_DIR .. "src/mame/drivers/segag80r.cpp",
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index e02b47c4198..89d3e36284f 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -108,15 +108,15 @@ function createProjects_mame_tiny(_target, _subtarget)
}
files{
- MAME_DIR .. "src/mame/audio/nl_carpolo.h",
MAME_DIR .. "src/mame/audio/nl_carpolo.cpp",
+ MAME_DIR .. "src/mame/audio/nl_carpolo.h",
MAME_DIR .. "src/mame/drivers/carpolo.cpp",
MAME_DIR .. "src/mame/includes/carpolo.h",
MAME_DIR .. "src/mame/machine/carpolo.cpp",
MAME_DIR .. "src/mame/video/carpolo.cpp",
+ MAME_DIR .. "src/mame/audio/circus.cpp",
MAME_DIR .. "src/mame/drivers/circus.cpp",
MAME_DIR .. "src/mame/includes/circus.h",
- MAME_DIR .. "src/mame/audio/circus.cpp",
MAME_DIR .. "src/mame/video/circus.cpp",
MAME_DIR .. "src/mame/drivers/exidy.cpp",
MAME_DIR .. "src/mame/includes/exidy.h",
@@ -147,11 +147,13 @@ files{
MAME_DIR .. "src/mame/includes/gridlee.h",
MAME_DIR .. "src/mame/audio/gridlee.cpp",
MAME_DIR .. "src/mame/video/gridlee.cpp",
+ MAME_DIR .. "src/mame/audio/s11c_bg.cpp",
+ MAME_DIR .. "src/mame/audio/s11c_bg.h",
+ MAME_DIR .. "src/mame/audio/williams.cpp",
+ MAME_DIR .. "src/mame/audio/williams.h",
MAME_DIR .. "src/mame/drivers/williams.cpp",
MAME_DIR .. "src/mame/includes/williams.h",
MAME_DIR .. "src/mame/machine/williams.cpp",
- MAME_DIR .. "src/mame/audio/williams.cpp",
- MAME_DIR .. "src/mame/audio/williams.h",
MAME_DIR .. "src/mame/video/williams.cpp",
MAME_DIR .. "src/mame/drivers/gaelco.cpp",
MAME_DIR .. "src/mame/includes/gaelco.h",
diff --git a/scripts/target/zexall/zexall.lua b/scripts/target/zexall/zexall.lua
index 008ea252d0c..4b07b2ca061 100644
--- a/scripts/target/zexall/zexall.lua
+++ b/scripts/target/zexall/zexall.lua
@@ -2,6 +2,8 @@ STANDALONE = true
CPUS["Z80"] = true
+MACHINES["Z80DAISY"] = true
+
function standalone()
files{
MAME_DIR .. "src/zexall/main.cpp",