summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/scripts')
-rw-r--r--docs/release/scripts/build/png2bdc.py109
-rw-r--r--docs/release/scripts/extlib.lua6
-rw-r--r--docs/release/scripts/font/NotoSans-Bold.bdcbin52993 -> 61317 bytes
-rw-r--r--docs/release/scripts/genie.lua21
-rw-r--r--docs/release/scripts/resources/uwp/mame_TemporaryKey.pfxbin0 -> 2454 bytes
-rw-r--r--docs/release/scripts/src/3rdparty.lua348
-rw-r--r--docs/release/scripts/src/bus.lua42
-rw-r--r--docs/release/scripts/src/cpu.lua28
-rw-r--r--docs/release/scripts/src/emu.lua5
-rw-r--r--docs/release/scripts/src/formats.lua12
-rw-r--r--docs/release/scripts/src/lib.lua14
-rw-r--r--docs/release/scripts/src/machine.lua53
-rw-r--r--docs/release/scripts/src/main.lua15
-rw-r--r--docs/release/scripts/src/netlist.lua58
-rw-r--r--docs/release/scripts/src/osd/modules.lua29
-rw-r--r--docs/release/scripts/src/osd/sdl.lua3
-rw-r--r--docs/release/scripts/src/osd/sdl_cfg.lua2
-rw-r--r--docs/release/scripts/src/osd/uwp_cfg.lua2
-rw-r--r--docs/release/scripts/src/osd/windows_cfg.lua2
-rw-r--r--docs/release/scripts/src/osd/winui.lua2
-rw-r--r--docs/release/scripts/src/osd/winui_cfg.lua2
-rw-r--r--docs/release/scripts/src/sound.lua23
-rw-r--r--docs/release/scripts/src/tools.lua15
-rw-r--r--docs/release/scripts/src/video.lua36
-rw-r--r--docs/release/scripts/target/hbmame/hbmame.lua36
-rw-r--r--docs/release/scripts/target/mame/arcade.lua63
-rw-r--r--docs/release/scripts/target/mame/mess.lua80
-rw-r--r--docs/release/scripts/target/mame/nl.lua24
-rw-r--r--docs/release/scripts/target/mame/tiny.lua2
29 files changed, 774 insertions, 258 deletions
diff --git a/docs/release/scripts/build/png2bdc.py b/docs/release/scripts/build/png2bdc.py
index 4ffeb4c01ab..a1be5c552d0 100644
--- a/docs/release/scripts/build/png2bdc.py
+++ b/docs/release/scripts/build/png2bdc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
##
## license:BSD-3-Clause
## copyright-holders:Aaron Giles, Andrew Gardner
@@ -50,7 +50,7 @@
##
## Python note:
## This is a near-literal translation of the original C++ code. As such there
-## are some very non-pythonic things done throughout. The conversion was done
+## are some very non-pythonic things done throughout. The conversion was done
## this way so as to insure compatibility as much as possible given the small
## number of test cases.
##
@@ -74,7 +74,7 @@ class RenderFontChar:
"""
Contains information about a single character in a font.
"""
-
+
def __init__(self):
"""
"""
@@ -90,10 +90,11 @@ class RenderFont:
"""
Contains information about a font
"""
-
+
def __init__(self):
self.height = 0 # height of the font, from ascent to descent
self.yOffs = 0 # y offset from baseline to descent
+ self.defChar = -1 # default character for glyphs not present
self.chars = list() # array of characters
for i in range(0, 65536):
self.chars.append(RenderFontChar())
@@ -107,7 +108,7 @@ def pixelIsSet(value):
return (value & 0xffffff) == 0
-def renderFontSaveCached(font, filename, hash32):
+def renderFontSaveCached(font, filename, length64, hash32):
"""
"""
fp = open(filename, "wb")
@@ -120,45 +121,61 @@ def renderFontSaveCached(font, filename, hash32):
if c.width > 0:
numChars += 1
- CACHED_CHAR_SIZE = 12
- CACHED_HEADER_SIZE = 16
-
+ CACHED_CHAR_SIZE = 16
+ CACHED_HEADER_SIZE = 32
+
try:
+ fp.write(b'b')
+ fp.write(b'd')
+ fp.write(b'c')
fp.write(b'f')
- fp.write(b'o')
fp.write(b'n')
fp.write(b't')
+ fp.write(b2p(1))
+ fp.write(b2p(0))
+ fp.write(b2p(length64 >> 56 & 0xff))
+ fp.write(b2p(length64 >> 48 & 0xff))
+ fp.write(b2p(length64 >> 40 & 0xff))
+ fp.write(b2p(length64 >> 32 & 0xff))
+ fp.write(b2p(length64 >> 24 & 0xff))
+ fp.write(b2p(length64 >> 16 & 0xff))
+ fp.write(b2p(length64 >> 8 & 0xff))
+ fp.write(b2p(length64 >> 0 & 0xff))
fp.write(b2p(hash32 >> 24 & 0xff))
fp.write(b2p(hash32 >> 16 & 0xff))
fp.write(b2p(hash32 >> 8 & 0xff))
fp.write(b2p(hash32 >> 0 & 0xff))
- fp.write(b2p(font.height >> 8 & 0xff))
- fp.write(b2p(font.height >> 0 & 0xff))
- fp.write(b2p(font.yOffs >> 8 & 0xff))
- fp.write(b2p(font.yOffs >> 0 & 0xff))
fp.write(b2p(numChars >> 24 & 0xff))
fp.write(b2p(numChars >> 16 & 0xff))
fp.write(b2p(numChars >> 8 & 0xff))
fp.write(b2p(numChars >> 0 & 0xff))
-
+ fp.write(b2p(font.height >> 8 & 0xff))
+ fp.write(b2p(font.height >> 0 & 0xff))
+ fp.write(b2p(font.yOffs >> 8 & 0xff))
+ fp.write(b2p(font.yOffs >> 0 & 0xff))
+ fp.write(b2p(font.defChar >> 24 & 0xff))
+ fp.write(b2p(font.defChar >> 16 & 0xff))
+ fp.write(b2p(font.defChar >> 8 & 0xff))
+ fp.write(b2p(font.defChar >> 0 & 0xff))
+
# Write a blank table at first (?)
charTable = [0]*(numChars * CACHED_CHAR_SIZE)
for i in range(numChars * CACHED_CHAR_SIZE):
fp.write(b2p(charTable[i]))
-
+
# Loop over all characters
tableIndex = 0
-
+
for i in range(len(font.chars)):
c = font.chars[i]
if c.width == 0:
continue
-
+
if c.bitmap:
dBuffer = list()
accum = 0
accbit = 7
-
+
# Bit-encode the character data
for y in range(0, c.bmHeight):
src = None
@@ -173,42 +190,44 @@ def renderFontSaveCached(font, filename, hash32):
dBuffer.append(accum)
accum = 0
accbit = 7
-
+
# Flush any extra
if accbit != 7:
dBuffer.append(accum)
-
+
# Write the data
for j in range(len(dBuffer)):
fp.write(b2p(dBuffer[j]))
-
+
destIndex = tableIndex * CACHED_CHAR_SIZE
- charTable[destIndex + 0] = i >> 8 & 0xff
- charTable[destIndex + 1] = i >> 0 & 0xff
- charTable[destIndex + 2] = c.width >> 8 & 0xff
- charTable[destIndex + 3] = c.width >> 0 & 0xff
- charTable[destIndex + 4] = c.xOffs >> 8 & 0xff
- charTable[destIndex + 5] = c.xOffs >> 0 & 0xff
- charTable[destIndex + 6] = c.yOffs >> 8 & 0xff
- charTable[destIndex + 7] = c.yOffs >> 0 & 0xff
- charTable[destIndex + 8] = c.bmWidth >> 8 & 0xff
- charTable[destIndex + 9] = c.bmWidth >> 0 & 0xff
- charTable[destIndex + 10] = c.bmHeight >> 8 & 0xff
- charTable[destIndex + 11] = c.bmHeight >> 0 & 0xff
+ charTable[destIndex + 0] = i >> 24 & 0xff
+ charTable[destIndex + 1] = i >> 16 & 0xff
+ charTable[destIndex + 2] = i >> 8 & 0xff
+ charTable[destIndex + 3] = i >> 0 & 0xff
+ charTable[destIndex + 4] = c.width >> 8 & 0xff
+ charTable[destIndex + 5] = c.width >> 0 & 0xff
+ charTable[destIndex + 8] = c.xOffs >> 8 & 0xff
+ charTable[destIndex + 9] = c.xOffs >> 0 & 0xff
+ charTable[destIndex + 10] = c.yOffs >> 8 & 0xff
+ charTable[destIndex + 11] = c.yOffs >> 0 & 0xff
+ charTable[destIndex + 12] = c.bmWidth >> 8 & 0xff
+ charTable[destIndex + 13] = c.bmWidth >> 0 & 0xff
+ charTable[destIndex + 14] = c.bmHeight >> 8 & 0xff
+ charTable[destIndex + 15] = c.bmHeight >> 0 & 0xff
tableIndex += 1
-
+
# Seek back to the beginning and rewrite the table
fp.seek(CACHED_HEADER_SIZE, 0)
for i in range(numChars * CACHED_CHAR_SIZE):
fp.write(b2p(charTable[i]))
-
+
fp.close()
return 0
except:
print(sys.exc_info[1])
return 1
-
+
def bitmapToChars(pngObject, font):
"""
@@ -225,7 +244,7 @@ def bitmapToChars(pngObject, font):
for r,g,b,a in zip(irpd, irpd, irpd, irpd):
cRow.append(a << 24 | r << 16 | g << 8 | b)
bitmap.append(cRow)
-
+
rowStart = 0
while rowStart < height:
# Find the top of the row
@@ -317,7 +336,7 @@ def bitmapToChars(pngObject, font):
ch.yOffs = font.yOffs
ch.bmWidth = len(ch.bitmap[0])
ch.bmHeight = len(ch.bitmap)
-
+
# Insert the character into the list
font.chars[chStart] = ch
@@ -327,7 +346,7 @@ def bitmapToChars(pngObject, font):
# Next row
rowStart = rowEnd + 1
-
+
# Return non-zero if we errored
return rowStart < height
@@ -341,7 +360,7 @@ def main():
sys.stderr.write("Usage:\n%s <input.png> [<input2.png> [...]] <output.bdc>\n" % sys.argv[0])
return 1
bdcName = sys.argv[-1]
-
+
font = RenderFont()
for i in range(1, len(sys.argv)-1):
filename = sys.argv[i]
@@ -359,12 +378,12 @@ def main():
error = bitmapToChars(pngObject, font)
if error:
return 1
-
- error = renderFontSaveCached(font, bdcName, 0)
+
+ error = renderFontSaveCached(font, bdcName, 0, 0)
return error
-
-
-
+
+
+
########################################
## Program entry point
########################################
diff --git a/docs/release/scripts/extlib.lua b/docs/release/scripts/extlib.lua
index a3949e3447b..674f1b1d881 100644
--- a/docs/release/scripts/extlib.lua
+++ b/docs/release/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/docs/release/scripts/font/NotoSans-Bold.bdc b/docs/release/scripts/font/NotoSans-Bold.bdc
index 8c13907b86a..2ac5c7e0e59 100644
--- a/docs/release/scripts/font/NotoSans-Bold.bdc
+++ b/docs/release/scripts/font/NotoSans-Bold.bdc
Binary files differ
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua
index 7a4668e7d14..e905e3b6aef 100644
--- a/docs/release/scripts/genie.lua
+++ b/docs/release/scripts/genie.lua
@@ -386,6 +386,11 @@ newoption {
description = "Produce WebAssembly output when building with Emscripten.",
}
+newoption {
+ trigger = "PROJECT",
+ description = "Select projects to be built. Will look into project folder for files.",
+}
+
dofile ("extlib.lua")
if _OPTIONS["SHLIB"]=="1" then
@@ -516,7 +521,14 @@ msgprecompile ("Precompiling $(subst ../,,$<)...")
messageskip { "SkipCreatingMessage", "SkipBuildingMessage", "SkipCleaningMessage" }
-if (_OPTIONS["SOURCES"] == nil) then
+if (_OPTIONS["PROJECT"] ~= nil) then
+ PROJECT_DIR = path.join(path.getabsolute(".."),"projects",_OPTIONS["PROJECT"]) .. "/"
+ if (not os.isfile(path.join("..", "projects", _OPTIONS["PROJECT"], "scripts", "target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then
+ error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
+ end
+ dofile (path.join(".." ,"projects", _OPTIONS["PROJECT"], "scripts", "target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
+end
+if (_OPTIONS["SOURCES"] == nil and _OPTIONS["PROJECT"] == nil) then
if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then
error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
end
@@ -1305,6 +1317,13 @@ configuration { "Debug", "gmake" }
configuration { }
if (_OPTIONS["SOURCES"] ~= nil) then
+ local str = _OPTIONS["SOURCES"]
+ for word in string.gmatch(str, '([^,]+)') do
+ if (not os.isfile(path.join(MAME_DIR ,word))) then
+ print("File " .. word.. " does not exist")
+ os.exit()
+ end
+ end
OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " target " .. _OPTIONS["subtarget"])
load(OUT_STR)()
os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"]..".flt")
diff --git a/docs/release/scripts/resources/uwp/mame_TemporaryKey.pfx b/docs/release/scripts/resources/uwp/mame_TemporaryKey.pfx
new file mode 100644
index 00000000000..de6ef5c5f88
--- /dev/null
+++ b/docs/release/scripts/resources/uwp/mame_TemporaryKey.pfx
Binary files differ
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua
index 8bdc39eddb0..e5b64df3ac0 100644
--- a/docs/release/scripts/src/3rdparty.lua
+++ b/docs/release/scripts/src/3rdparty.lua
@@ -902,155 +902,166 @@ end
--------------------------------------------------
-- PortAudio library objects
--------------------------------------------------
---
---if not _OPTIONS["with-system-portaudio"] then
---project "portaudio"
--- uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
--- kind "StaticLib"
---
--- configuration { "vs*" }
--- buildoptions {
--- "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
--- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
--- "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
--- "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch
--- "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
--- "/wd4127", -- warning C4127: conditional expression is constant
--- }
---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
--- configuration { "vs201*" }
--- buildoptions {
--- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
--- }
---
--- configuration { "gmake or ninja" }
--- buildoptions_c {
--- "-Wno-strict-prototypes",
--- "-Wno-bad-function-cast",
--- "-Wno-undef",
--- "-Wno-missing-braces",
--- "-Wno-unused-variable",
--- "-Wno-unused-value",
--- "-Wno-unused-function",
--- "-Wno-unknown-pragmas",
--- }
---
--- local version = str_to_version(_OPTIONS["gcc_version"])
--- if (_OPTIONS["gcc"]~=nil) then
--- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
--- buildoptions_c {
--- "-Wno-unknown-warning-option",
--- "-Wno-absolute-value",
--- "-Wno-unused-but-set-variable",
--- "-Wno-maybe-uninitialized",
--- "-Wno-sometimes-uninitialized",
--- }
--- else
--- if (version >= 40600) then
--- buildoptions_c {
--- "-Wno-unused-but-set-variable",
--- "-Wno-maybe-uninitialized",
--- "-Wno-sometimes-uninitialized",
--- }
--- end
--- end
--- end
--- configuration { "vs*" }
--- buildoptions {
--- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
--- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
--- }
---
--- configuration { }
---
--- includedirs {
--- MAME_DIR .. "3rdparty/portaudio/include",
--- MAME_DIR .. "3rdparty/portaudio/src/common",
--- }
---
--- files {
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
--- }
---
--- if _OPTIONS["targetos"]=="windows" then
--- defines {
--- "PA_USE_DS=1",
--- "PA_USE_WDMKS=1",
--- "PA_USE_WMME=1",
--- }
--- includedirs {
--- MAME_DIR .. "3rdparty/portaudio/src/os/win",
--- }
---
--- configuration { }
--- files {
--- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
--- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
--- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
--- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_wdmks_utils.c",
--- MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
--- }
---
--- end
--- if _OPTIONS["targetos"]=="linux" then
--- defines {
--- "PA_USE_ALSA=1",
--- "PA_USE_OSS=1",
--- "HAVE_LINUX_SOUNDCARD_H",
--- }
--- includedirs {
--- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
--- }
--- files {
--- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
--- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
--- }
--- end
--- if _OPTIONS["targetos"]=="macosx" then
--- defines {
--- "PA_USE_COREAUDIO=1",
--- }
--- includedirs {
--- MAME_DIR .. "3rdparty/portaudio/src/os/unix",
--- }
--- files {
--- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
--- MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
--- MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
--- MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
--- }
--- end
---
---else
---links {
--- ext_lib("portaudio"),
---}
---end
+if _OPTIONS["NO_USE_PORTAUDIO"]~="1" then
+if not _OPTIONS["with-system-portaudio"] then
+project "portaudio"
+ uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
+ kind "StaticLib"
+
+ configuration { "vs*" }
+ buildoptions {
+ "/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+ "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
+ "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
+ "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch
+ "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
+ "/wd4127", -- warning C4127: conditional expression is constant
+ }
+ 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
+ configuration { "vs2015*" }
+ buildoptions {
+ "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
+ }
+
+ configuration { "gmake or ninja" }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ "-Wno-bad-function-cast",
+ "-Wno-undef",
+ "-Wno-missing-braces",
+ "-Wno-unused-variable",
+ "-Wno-unused-value",
+ "-Wno-unused-function",
+ "-Wno-unknown-pragmas",
+ }
+
+ local version = str_to_version(_OPTIONS["gcc_version"])
+ if (_OPTIONS["gcc"]~=nil) then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
+ buildoptions_c {
+ "-Wno-unknown-warning-option",
+ "-Wno-absolute-value",
+ "-Wno-unused-but-set-variable",
+ "-Wno-maybe-uninitialized",
+ "-Wno-sometimes-uninitialized",
+ }
+ else
+ if (version >= 40600) then
+ buildoptions_c {
+ "-Wno-unused-but-set-variable",
+ "-Wno-maybe-uninitialized",
+ "-Wno-sometimes-uninitialized",
+ "-w",
+ "-Wno-incompatible-pointer-types-discards-qualifiers",
+ }
+ end
+ end
+ end
+ configuration { "vs*" }
+ buildoptions {
+ "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
+ "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+ "/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx'
+ }
+
+ configuration { }
+
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/include",
+ MAME_DIR .. "3rdparty/portaudio/src/common",
+ }
+
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_allocation.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_converters.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_cpuload.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_dither.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_debugprint.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_front.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_process.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_stream.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_trace.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/skeleton/pa_hostapi_skeleton.c",
+ }
+
+ if _OPTIONS["targetos"]=="windows" then
+ defines {
+ "PA_USE_DS=1",
+ "PA_USE_WASAPI=1",
+ "PA_USE_WDMKS=1",
+ "PA_USE_WMME=1",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/os/win",
+ }
+
+ configuration { "mingw*" }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/wasapi/mingw-include",
+ }
+
+ configuration { }
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_util.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_waveformat.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_coinitialize.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/win/pa_win_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/wasapi/pa_win_wasapi.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/wdmks/pa_win_wdmks.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/wmme/pa_win_wmme.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+ }
+
+ end
+ if _OPTIONS["targetos"]=="linux" then
+ defines {
+ "PA_USE_ALSA=1",
+ "PA_USE_OSS=1",
+ "HAVE_LINUX_SOUNDCARD_H",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+ }
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/oss/pa_unix_oss.c",
+ }
+ end
+ if _OPTIONS["targetos"]=="macosx" then
+ defines {
+ "PA_USE_COREAUDIO=1",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix",
+ }
+ files {
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_hostapis.c",
+ MAME_DIR .. "3rdparty/portaudio/src/os/unix/pa_unix_util.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c",
+ MAME_DIR .. "3rdparty/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c",
+ MAME_DIR .. "3rdparty/portaudio/src/common/pa_ringbuffer.c",
+ }
+ end
+
+else
+links {
+ ext_lib("portaudio"),
+}
+end
+end
--------------------------------------------------
-- SDL2 library
@@ -1585,3 +1596,42 @@ project "linenoise-ng"
MAME_DIR .. "3rdparty/linenoise-ng/src/wcwidth.cpp",
}
end
+
+
+--------------------------------------------------
+-- utf8proc library objects
+--------------------------------------------------
+
+if not _OPTIONS["with-system-utf8proc"] then
+project "utf8proc"
+ uuid "1f881f09-0395-4483-ac37-2935fb092187"
+ kind "StaticLib"
+
+ defines {
+ "UTF8PROC_DLLEXPORT="
+ }
+
+ configuration "Debug"
+ defines {
+ "verbose=-1",
+ }
+
+ configuration { "gmake or ninja" }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ }
+
+ configuration { }
+ defines {
+ "ZLIB_CONST",
+ }
+
+ files {
+ MAME_DIR .. "3rdparty/utf8proc/utf8proc.c"
+ }
+else
+links {
+ ext_lib("utf8proc"),
+}
+end
+
diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua
index 30393418485..3f8f3f1d233 100644
--- a/docs/release/scripts/src/bus.lua
+++ b/docs/release/scripts/src/bus.lua
@@ -761,6 +761,8 @@ if (BUSES["IEEE488"]~=null) then
MAME_DIR .. "src/devices/bus/ieee488/hardbox.h",
MAME_DIR .. "src/devices/bus/ieee488/shark.cpp",
MAME_DIR .. "src/devices/bus/ieee488/shark.h",
+ MAME_DIR .. "src/devices/bus/ieee488/hp9895.cpp",
+ MAME_DIR .. "src/devices/bus/ieee488/hp9895.h",
}
end
@@ -1486,6 +1488,29 @@ end
---------------------------------------------------
--
+--@src/devices/bus/vme/vme.h,BUSES["VME"] = true
+---------------------------------------------------
+
+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_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
+
+
+---------------------------------------------------
+--
--@src/devices/bus/wangpc/wangpc.h,BUSES["WANGPC"] = true
---------------------------------------------------
@@ -2416,6 +2441,7 @@ if (BUSES["COCO"]~=null) then
MAME_DIR .. "src/devices/bus/coco/coco_dwsock.cpp",
MAME_DIR .. "src/devices/bus/coco/coco_dwsock.h",
MAME_DIR .. "src/devices/bus/coco/dragon_fdc.cpp",
+ MAME_DIR .. "src/devices/bus/coco/coco_t4426.cpp",
}
end
@@ -2621,6 +2647,22 @@ 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/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/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua
index 126d28ed524..72a7ffea3fa 100644
--- a/docs/release/scripts/src/cpu.lua
+++ b/docs/release/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 or CPUS["ADSP21062"]~=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 or CPUS["MB86235"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/drcbec.cpp",
MAME_DIR .. "src/devices/cpu/drcbec.h",
@@ -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
@@ -1064,6 +1064,9 @@ if (CPUS["MB86235"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/mb86235/mb86235.cpp",
MAME_DIR .. "src/devices/cpu/mb86235/mb86235.h",
+ MAME_DIR .. "src/devices/cpu/mb86235/mb86235drc.cpp",
+ MAME_DIR .. "src/devices/cpu/mb86235/mb86235fe.cpp",
+ MAME_DIR .. "src/devices/cpu/mb86235/mb86235fe.h",
}
end
@@ -1332,7 +1335,10 @@ if (CPUS["M6805"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/m6805/m6805.cpp",
MAME_DIR .. "src/devices/cpu/m6805/m6805.h",
+ MAME_DIR .. "src/devices/cpu/m6805/6805defs.h",
MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx",
+ MAME_DIR .. "src/devices/cpu/m6805/m68705.cpp",
+ MAME_DIR .. "src/devices/cpu/m6805/m68705.h",
}
end
@@ -2409,3 +2415,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 \ No newline at end of file
diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua
index cd94d54f925..62d33a18eb9 100644
--- a/docs/release/scripts/src/emu.lua
+++ b/docs/release/scripts/src/emu.lua
@@ -39,6 +39,7 @@ includedirs {
files {
MAME_DIR .. "src/emu/emu.h",
MAME_DIR .. "src/emu/main.h",
+ MAME_DIR .. "src/emu/main.cpp",
MAME_DIR .. "src/emu/gamedrv.h",
MAME_DIR .. "src/emu/hashfile.cpp",
MAME_DIR .. "src/emu/hashfile.h",
@@ -93,8 +94,6 @@ files {
MAME_DIR .. "src/emu/dislot.h",
MAME_DIR .. "src/emu/disound.cpp",
MAME_DIR .. "src/emu/disound.h",
- MAME_DIR .. "src/emu/dispatch.cpp",
- MAME_DIR .. "src/emu/dispatch.h",
MAME_DIR .. "src/emu/distate.cpp",
MAME_DIR .. "src/emu/distate.h",
MAME_DIR .. "src/emu/divideo.cpp",
@@ -129,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",
@@ -183,7 +183,6 @@ files {
MAME_DIR .. "src/emu/video.h",
MAME_DIR .. "src/emu/rendersw.hxx",
MAME_DIR .. "src/emu/ui/uimain.h",
- MAME_DIR .. "src/emu/ui/cmdrender.h", -- TODO: remove
MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove
MAME_DIR .. "src/emu/debug/debugcmd.cpp",
MAME_DIR .. "src/emu/debug/debugcmd.h",
diff --git a/docs/release/scripts/src/formats.lua b/docs/release/scripts/src/formats.lua
index 4606137b17c..994633e26b2 100644
--- a/docs/release/scripts/src/formats.lua
+++ b/docs/release/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/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua
index 51b92d098d2..9c631aebbab 100644
--- a/docs/release/scripts/src/lib.lua
+++ b/docs/release/scripts/src/lib.lua
@@ -22,6 +22,7 @@ project "utils"
ext_includedir("expat"),
ext_includedir("zlib"),
ext_includedir("flac"),
+ ext_includedir("utf8proc"),
}
files {
@@ -31,6 +32,7 @@ project "utils"
MAME_DIR .. "src/lib/util/avhuff.h",
MAME_DIR .. "src/lib/util/aviio.cpp",
MAME_DIR .. "src/lib/util/aviio.h",
+ MAME_DIR .. "src/lib/util/base64.hpp",
MAME_DIR .. "src/lib/util/bitmap.cpp",
MAME_DIR .. "src/lib/util/bitmap.h",
MAME_DIR .. "src/lib/util/cdrom.cpp",
@@ -41,6 +43,10 @@ project "utils"
MAME_DIR .. "src/lib/util/chdcd.h",
MAME_DIR .. "src/lib/util/chdcodec.cpp",
MAME_DIR .. "src/lib/util/chdcodec.h",
+ MAME_DIR .. "src/lib/util/client_http.hpp",
+ MAME_DIR .. "src/lib/util/client_https.hpp",
+ MAME_DIR .. "src/lib/util/client_ws.hpp",
+ MAME_DIR .. "src/lib/util/client_wss.hpp",
MAME_DIR .. "src/lib/util/corealloc.h",
MAME_DIR .. "src/lib/util/corefile.cpp",
MAME_DIR .. "src/lib/util/corefile.h",
@@ -48,6 +54,7 @@ project "utils"
MAME_DIR .. "src/lib/util/corestr.h",
MAME_DIR .. "src/lib/util/coreutil.cpp",
MAME_DIR .. "src/lib/util/coreutil.h",
+ MAME_DIR .. "src/lib/util/crypto.hpp",
MAME_DIR .. "src/lib/util/delegate.cpp",
MAME_DIR .. "src/lib/util/delegate.h",
MAME_DIR .. "src/lib/util/flac.cpp",
@@ -71,14 +78,21 @@ project "utils"
MAME_DIR .. "src/lib/util/options.h",
MAME_DIR .. "src/lib/util/palette.cpp",
MAME_DIR .. "src/lib/util/palette.h",
+ MAME_DIR .. "src/lib/util/path_to_regex.cpp",
+ MAME_DIR .. "src/lib/util/path_to_regex.h",
MAME_DIR .. "src/lib/util/plaparse.cpp",
MAME_DIR .. "src/lib/util/plaparse.h",
MAME_DIR .. "src/lib/util/png.cpp",
MAME_DIR .. "src/lib/util/png.h",
MAME_DIR .. "src/lib/util/pool.cpp",
MAME_DIR .. "src/lib/util/pool.h",
+ MAME_DIR .. "src/lib/util/server_http.hpp",
+ MAME_DIR .. "src/lib/util/server_https.hpp",
+ MAME_DIR .. "src/lib/util/server_ws.hpp",
+ MAME_DIR .. "src/lib/util/server_wss.hpp",
MAME_DIR .. "src/lib/util/sha1.cpp",
MAME_DIR .. "src/lib/util/sha1.h",
+ MAME_DIR .. "src/lib/util/sha1.hpp",
MAME_DIR .. "src/lib/util/strformat.cpp",
MAME_DIR .. "src/lib/util/strformat.h",
MAME_DIR .. "src/lib/util/timeconv.cpp",
diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua
index 01808d48c78..d133e2efe42 100644
--- a/docs/release/scripts/src/machine.lua
+++ b/docs/release/scripts/src/machine.lua
@@ -236,6 +236,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/68153bim.h,MACHINES["BIM68153"] = true
+---------------------------------------------------
+
+if (MACHINES["BIM68153"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/68153bim.cpp",
+ MAME_DIR .. "src/devices/machine/68153bim.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/68230pit.h,MACHINES["PIT68230"] = true
---------------------------------------------------
@@ -248,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",
@@ -357,6 +369,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/74157.h,MACHINES["TTL74157"] = true
+---------------------------------------------------
+
+if (MACHINES["TTL74157"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/74157.cpp",
+ MAME_DIR .. "src/devices/machine/74157.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/74161.h,MACHINES["TTL74161"] = true
---------------------------------------------------
@@ -659,6 +683,19 @@ end
---------------------------------------------------
--
+--@src/devices/machine/cdp1879.h,MACHINES["CDP1879"] = true
+---------------------------------------------------
+
+if (MACHINES["CDP1879"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/cdp1879.cpp",
+ MAME_DIR .. "src/devices/machine/cdp1879.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/machine/com8116.h,MACHINES["COM8116"] = true
---------------------------------------------------
@@ -1905,6 +1942,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/phi.h,MACHINES["PHI"] = true
+---------------------------------------------------
+
+if (MACHINES["PHI"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/phi.cpp",
+ MAME_DIR .. "src/devices/machine/phi.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/pic8259.h,MACHINES["PIC8259"] = true
---------------------------------------------------
diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua
index 137cb6979d0..37c309d5f46 100644
--- a/docs/release/scripts/src/main.lua
+++ b/docs/release/scripts/src/main.lua
@@ -276,9 +276,24 @@ end
links {
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
+ }
+if (STANDALONE~=true) then
+ links {
ext_lib("sqlite3"),
}
+end
+ if _OPTIONS["NO_USE_PORTAUDIO"]~="1" then
+ links {
+ ext_lib("portaudio"),
+ }
+ if _OPTIONS["targetos"]=="windows" then
+ links {
+ "setupapi",
+ }
+ end
+ end
if _OPTIONS["NO_USE_MIDI"]~="1" then
links {
ext_lib("portmidi"),
diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua
index 70feb291aa5..2fa85e9196b 100644
--- a/docs/release/scripts/src/netlist.lua
+++ b/docs/release/scripts/src/netlist.lua
@@ -28,23 +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_config.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_lists.h",
- MAME_DIR .. "src/lib/netlist/nl_time.h",
- MAME_DIR .. "src/lib/netlist/nl_base.cpp",
- MAME_DIR .. "src/lib/netlist/nl_base.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_factory.cpp",
- MAME_DIR .. "src/lib/netlist/nl_factory.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/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",
@@ -79,6 +84,7 @@ project "netlist"
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.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
@@ -91,18 +97,30 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/solver/nld_ms_w.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h",
MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_2102A.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_2102A.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_2716.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_2716.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_4316.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_4316.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7448.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7450.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7473.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7473.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7474.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7474.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7475.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7475.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7483.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7483.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7485.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7485.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7490.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7490.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7493.cpp",
@@ -113,30 +131,56 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_74123.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74153.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74153.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74161.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74161.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74165.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74165.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74166.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74166.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74174.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74174.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74175.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74175.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74192.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74192.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74193.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74193.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74194.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74194.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74279.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74279.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74365.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_74365.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74ls629.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74ls629.h",
MAME_DIR .. "src/lib/netlist/devices/nld_82S16.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_82S16.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82S115.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82S115.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82S123.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82S123.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82S126.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_82S126.h",
MAME_DIR .. "src/lib/netlist/devices/nld_9310.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_9310.h",
MAME_DIR .. "src/lib/netlist/devices/nld_9312.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_9312.h",
MAME_DIR .. "src/lib/netlist/devices/nld_9316.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_9316.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_9322.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_9322.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_am2847.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_am2847.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.h",
MAME_DIR .. "src/lib/netlist/devices/nld_ne555.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_ne555.h",
MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.h",
MAME_DIR .. "src/lib/netlist/devices/nld_r2r_dac.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_r2r_dac.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_tristate.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_tristate.h",
MAME_DIR .. "src/lib/netlist/devices/nld_legacy.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_legacy.h",
MAME_DIR .. "src/lib/netlist/devices/net_lib.cpp",
@@ -149,6 +193,10 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_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/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/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua
index a863cd360b9..9ca2bcaa196 100644
--- a/docs/release/scripts/src/osd/modules.lua
+++ b/docs/release/scripts/src/osd/modules.lua
@@ -80,6 +80,7 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/midi/none.cpp",
MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/pa_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
@@ -122,6 +123,7 @@ function osdmodulesbuild()
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",
MAME_DIR .. "3rdparty/compat/mingw",
+ MAME_DIR .. "3rdparty/portaudio/include",
}
includedirs {
@@ -215,6 +217,16 @@ function osdmodulesbuild()
MAME_DIR .. "3rdparty/rapidjson/include",
}
+ if _OPTIONS["NO_USE_PORTAUDIO"]=="1" then
+ defines {
+ "NO_USE_PORTAUDIO",
+ }
+ else
+ includedirs {
+ ext_includedir("portaudio"),
+ }
+ end
+
if _OPTIONS["NO_USE_MIDI"]=="1" then
defines {
"NO_USE_MIDI",
@@ -494,6 +506,23 @@ if not _OPTIONS["NO_USE_MIDI"] then
end
newoption {
+ trigger = "NO_USE_PORTAUDIO",
+ description = "Disable PortAudio interface",
+ allowed = {
+ { "0", "Enable PortAudio" },
+ { "1", "Disable PortAudio" },
+ },
+}
+
+if not _OPTIONS["NO_USE_PORTAUDIO"] then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="macosx" then
+ _OPTIONS["NO_USE_PORTAUDIO"] = "0"
+ else
+ _OPTIONS["NO_USE_PORTAUDIO"] = "1"
+ end
+end
+
+newoption {
trigger = "MODERN_WIN_API",
description = "Use Modern Windows APIs",
allowed = {
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua
index af6ff1b98ce..5970f6d3334 100644
--- a/docs/release/scripts/src/osd/sdl.lua
+++ b/docs/release/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/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua
index b8f24d27d3b..3f8e3e10bbc 100644
--- a/docs/release/scripts/src/osd/sdl_cfg.lua
+++ b/docs/release/scripts/src/osd/sdl_cfg.lua
@@ -109,6 +109,8 @@ if _OPTIONS["targetos"]=="windows" then
"_UNICODE",
"main=utf8_main",
"_WIN32_WINNT=0x0501",
+ "WIN32_LEAN_AND_MEAN",
+ "NOMINMAX",
}
configuration { }
diff --git a/docs/release/scripts/src/osd/uwp_cfg.lua b/docs/release/scripts/src/osd/uwp_cfg.lua
index 234327aada0..28892656728 100644
--- a/docs/release/scripts/src/osd/uwp_cfg.lua
+++ b/docs/release/scripts/src/osd/uwp_cfg.lua
@@ -11,6 +11,8 @@ defines {
"_WIN32_WINNT=0x0603",
"NTDDI_VERSION=0x06030000",
"MODERN_WIN_API",
+ "WIN32_LEAN_AND_MEAN",
+ "NOMINMAX",
}
flags {
diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua
index 1ba0efe6151..1baa45f4255 100644
--- a/docs/release/scripts/src/osd/windows_cfg.lua
+++ b/docs/release/scripts/src/osd/windows_cfg.lua
@@ -3,6 +3,8 @@
defines {
"OSD_WINDOWS",
+ "WIN32_LEAN_AND_MEAN",
+ "NOMINMAX",
}
configuration { "mingw* or vs*" }
diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua
index 76b6902145b..8cfdd0408e2 100644
--- a/docs/release/scripts/src/osd/winui.lua
+++ b/docs/release/scripts/src/osd/winui.lua
@@ -204,7 +204,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h",
MAME_DIR .. "src/osd/winui/bitmask.cpp",
MAME_DIR .. "src/osd/winui/columnedit.cpp",
- MAME_DIR .. "src/osd/winui/datafile.cpp",
MAME_DIR .. "src/osd/winui/datamap.cpp",
MAME_DIR .. "src/osd/winui/dialogs.cpp",
MAME_DIR .. "src/osd/winui/dijoystick.cpp",
@@ -229,7 +228,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/winui/tabview.cpp",
MAME_DIR .. "src/osd/winui/treeview.cpp",
MAME_DIR .. "src/osd/winui/winui.cpp",
- MAME_DIR .. "src/osd/winui/win_options.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
diff --git a/docs/release/scripts/src/osd/winui_cfg.lua b/docs/release/scripts/src/osd/winui_cfg.lua
index 5dcaaaf0348..9c5cb9b3778 100644
--- a/docs/release/scripts/src/osd/winui_cfg.lua
+++ b/docs/release/scripts/src/osd/winui_cfg.lua
@@ -7,6 +7,8 @@ defines {
"main=utf8_main",
"_WIN32_WINNT=0x0501",
"USE_QTDEBUG=0",
+ "WIN32_LEAN_AND_MEAN",
+ "NOMINMAX",
}
configuration { "vs*" }
diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua
index fc555804072..ab05c06847c 100644
--- a/docs/release/scripts/src/sound.lua
+++ b/docs/release/scripts/src/sound.lua
@@ -1401,3 +1401,26 @@ if (SOUNDS["VOLT_REG"]~=null) then
MAME_DIR .. "src/devices/sound/volt_reg.h",
}
end
+
+---------------------------------------------------
+-- DAC-76 COMDAC
+--@src/devices/sound/dac76.h,SOUNDS["DAC76"] = true
+---------------------------------------------------
+if (SOUNDS["DAC76"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/dac76.cpp",
+ MAME_DIR .. "src/devices/sound/dac76.h",
+ }
+end
+
+---------------------------------------------------
+-- MM5837 Noise Generator
+--@src/devices/sound/mm5837.h,MACHINES["MM5837"] = true
+---------------------------------------------------
+
+if (SOUNDS["MM5837"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/mm5837.cpp",
+ MAME_DIR .. "src/devices/sound/mm5837.h",
+ }
+end
diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua
index 0d784113b82..54bff0efb43 100644
--- a/docs/release/scripts/src/tools.lua
+++ b/docs/release/scripts/src/tools.lua
@@ -31,6 +31,7 @@ links {
"7z",
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -73,6 +74,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -118,6 +120,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -161,6 +164,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -206,6 +210,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -252,6 +257,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -296,6 +302,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -336,6 +343,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -376,6 +384,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -418,6 +427,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -458,6 +468,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -501,6 +512,7 @@ links {
"netlist",
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -585,6 +597,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -630,6 +643,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -675,6 +689,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua
index cad05c3ac1b..ba52eb78bcd 100644
--- a/docs/release/scripts/src/video.lua
+++ b/docs/release/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
--------------------------------------------------
@@ -900,3 +924,15 @@ if (VIDEOS["GBA_LCD"]~=null) then
MAME_DIR .. "src/devices/video/gba_lcd.h",
}
end
+
+--------------------------------------------------
+--
+--@src/devices/video/ef9369.h,VIDEOS["EF9369"] = true
+--------------------------------------------------
+
+if (VIDEOS["EF9369"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/ef9369.cpp",
+ MAME_DIR .. "src/devices/video/ef9369.h",
+ }
+end
diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua
index 68e8ffc1bcc..652f358e34e 100644
--- a/docs/release/scripts/target/hbmame/hbmame.lua
+++ b/docs/release/scripts/target/hbmame/hbmame.lua
@@ -13,6 +13,7 @@
---------------------------------------------------
CPUS["ADSP21XX"] = true
+CPUS["ADSP21062"] = true -- model2
CPUS["ARM"] = true
CPUS["ARM7"] = true
CPUS["CCPU"] = true
@@ -22,12 +23,15 @@ CPUS["HD6309"] = true
CPUS["I8085"] = true
CPUS["I8089"] = true
CPUS["I86"] = true
+CPUS["I960"] = true -- model2
CPUS["M6502"] = true
CPUS["M6800"] = true
CPUS["M6805"] = true
CPUS["M6809"] = true
CPUS["M680X0"] = true
CPUS["MB88XX"] = true
+CPUS["MB86233"] = true -- model2
+CPUS["MB86235"] = true -- model2
CPUS["MCS48"] = true
CPUS["MCS51"] = true
CPUS["NEC"] = true
@@ -96,6 +100,9 @@ SOUNDS["ST0016"] = true
SOUNDS["VOLT_REG"] = true
SOUNDS["VOTRAX"] = true
SOUNDS["DIGITALKER"] = true
+SOUNDS["MULTIPCM"] = true -- model2
+SOUNDS["SCSP"] = true -- model2
+SOUNDS["MPEG_AUDIO"] = true -- model2
--------------------------------------------------
-- specify available video cores
@@ -136,6 +143,7 @@ MACHINES["NETLIST"] = true
MACHINES["RP5H01"] = true
MACHINES["TIMEKPR"] = true
MACHINES["TMS6100"] = true
+MACHINES["TTL74157"] = true
MACHINES["UPD1990A"] = true
MACHINES["UPD4992"] = true
MACHINES["V3021"] = true
@@ -422,8 +430,6 @@ files {
MAME_DIR .. "src/mame/video/mw8080bw.cpp",
MAME_DIR .. "src/hbmame/drivers/astrocde.cpp",
MAME_DIR .. "src/mame/video/astrocde.cpp",
- MAME_DIR .. "src/mame/audio/gorf.cpp",
- MAME_DIR .. "src/mame/audio/wow.cpp",
MAME_DIR .. "src/hbmame/drivers/mcr.cpp",
MAME_DIR .. "src/mame/machine/mcr.cpp",
MAME_DIR .. "src/mame/video/mcr.cpp",
@@ -449,6 +455,8 @@ files {
MAME_DIR .. "src/mame/audio/midway.cpp",
MAME_DIR .. "src/mame/audio/cage.cpp",
MAME_DIR .. "src/mame/audio/dcs.cpp",
+ MAME_DIR .. "src/mame/audio/csd.cpp",
+ MAME_DIR .. "src/mame/audio/csd.h",
}
createHBMAMEProjects(_target, _subtarget, "namco")
@@ -576,6 +584,8 @@ files {
MAME_DIR .. "src/hbmame/drivers/mario.cpp",
MAME_DIR .. "src/mame/audio/mario.cpp",
MAME_DIR .. "src/mame/video/mario.cpp",
+ MAME_DIR .. "src/mame/audio/nl_mario.cpp",
+ MAME_DIR .. "src/mame/audio/nl_mario.h",
MAME_DIR .. "src/hbmame/drivers/mmagic.cpp",
MAME_DIR .. "src/hbmame/drivers/playch10.cpp",
MAME_DIR .. "src/mame/machine/playch10.cpp",
@@ -650,6 +660,22 @@ files {
MAME_DIR .. "src/mame/video/sega16sp.cpp",
MAME_DIR .. "src/hbmame/drivers/segas16b.cpp",
MAME_DIR .. "src/mame/video/segas16b.cpp",
+ MAME_DIR .. "src/mame/machine/m2comm.cpp", -- from here, for model2
+ MAME_DIR .. "src/mame/machine/m2comm.h",
+ MAME_DIR .. "src/mame/audio/dsbz80.cpp",
+ MAME_DIR .. "src/mame/audio/dsbz80.h",
+ MAME_DIR .. "src/hbmame/drivers/model2.cpp",
+ MAME_DIR .. "src/mame/includes/model2.h",
+ MAME_DIR .. "src/mame/video/model2rd.hxx",
+ MAME_DIR .. "src/mame/video/model2.cpp",
+ MAME_DIR .. "src/mame/audio/segam1audio.cpp",
+ MAME_DIR .. "src/mame/audio/segam1audio.h",
+ MAME_DIR .. "src/mame/video/segaic24.cpp",
+ MAME_DIR .. "src/mame/video/segaic24.h",
+ MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp",
+ MAME_DIR .. "src/mame/machine/315-5881_crypt.h",
+ MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.cpp",
+ MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.h",
}
createHBMAMEProjects(_target, _subtarget, "seta")
@@ -679,7 +705,6 @@ files {
MAME_DIR .. "src/hbmame/drivers/rastan.cpp",
MAME_DIR .. "src/mame/video/rastan.cpp",
MAME_DIR .. "src/hbmame/drivers/retofinv.cpp",
- MAME_DIR .. "src/mame/machine/retofinv.cpp",
MAME_DIR .. "src/mame/video/retofinv.cpp",
MAME_DIR .. "src/hbmame/drivers/taito_b.cpp",
MAME_DIR .. "src/mame/video/taito_b.cpp",
@@ -705,6 +730,8 @@ files {
MAME_DIR .. "src/mame/video/tc0180vcu.cpp",
MAME_DIR .. "src/hbmame/drivers/taito_l.cpp",
MAME_DIR .. "src/mame/video/taito_l.cpp",
+ MAME_DIR .. "src/mame/machine/taito68705interface.cpp",
+ MAME_DIR .. "src/mame/machine/taito68705interface.h",
}
createHBMAMEProjects(_target, _subtarget, "tehkan")
@@ -728,7 +755,7 @@ files {
createHBMAMEProjects(_target, _subtarget, "toaplan")
files {
- MAME_DIR .. "src/hbmame/drivers/toaplan1.cpp",
+ MAME_DIR .. "src/mame/drivers/toaplan1.cpp",
MAME_DIR .. "src/mame/machine/toaplan1.cpp",
MAME_DIR .. "src/mame/video/toaplan1.cpp",
MAME_DIR .. "src/hbmame/drivers/toaplan2.cpp",
@@ -772,6 +799,7 @@ files {
MAME_DIR .. "src/hbmame/drivers/popper.cpp",
MAME_DIR .. "src/hbmame/drivers/kyugo.cpp",
MAME_DIR .. "src/mame/video/kyugo.cpp",
+ MAME_DIR .. "src/mame/drivers/skimaxx.cpp",
}
end
diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua
index 84fbe513f1e..704cb345343 100644
--- a/docs/release/scripts/target/mame/arcade.lua
+++ b/docs/release/scripts/target/mame/arcade.lua
@@ -263,6 +263,8 @@ SOUNDS["AD1848"] = true
--SOUNDS["UPD1771"] = true
SOUNDS["VOLT_REG"] = true
--SOUNDS["MEA8000"] = true
+SOUNDS["DAC76"] = true
+SOUNDS["MM5837"] = true
--------------------------------------------------
-- specify available video cores
@@ -283,6 +285,7 @@ VIDEOS["DM9368"] = true
--VIDEOS["EF9345"] = true
--VIDEOS["EF9364"] = true
--VIDEOS["EF9365"] = true
+VIDEOS["EF9369"] = true
--VIDEOS["GF4500"] = true
VIDEOS["GF7600GS"] = true
VIDEOS["EPIC12"] = true
@@ -293,6 +296,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
@@ -348,7 +352,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
@@ -359,6 +363,7 @@ MACHINES["TTL74123"] = true
MACHINES["TTL74145"] = true
MACHINES["TTL74148"] = true
MACHINES["TTL74153"] = true
+MACHINES["TTL74157"] = true
--MACHINES["TTL74161"] = true
--MACHINES["TTL74175"] = true
MACHINES["TTL74181"] = true
@@ -383,9 +388,10 @@ MACHINES["AT45DBXX"] = true
MACHINES["ATAFLASH"] = true
MACHINES["AY31015"] = true
MACHINES["BANKDEV"] = true
+--MACHINES["BIM68153"] = true
MACHINES["CDP1852"] = true
MACHINES["CDP1871"] = true
---MACHINES["CMOS40105"] = true
+MACHINES["CMOS40105"] = true
MACHINES["CDU76S"] = true
MACHINES["COM8116"] = true
MACHINES["CR589"] = true
@@ -501,6 +507,7 @@ MACHINES["PCF8593"] = true
MACHINES["PCI"] = true
MACHINES["PCKEYBRD"] = true
MACHINES["PIC8259"] = true
+--MACHINES["PIT68230"] = true
MACHINES["PIT8253"] = true
MACHINES["PLA"] = true
--MACHINES["PROFILE"] = true
@@ -563,6 +570,8 @@ MACHINES["X76F041"] = true
MACHINES["X76F100"] = true
MACHINES["Z80CTC"] = true
MACHINES["Z80DART"] = true
+MACHINES["Z80SIO"] = true
+MACHINES["Z80SCC"] = true
MACHINES["Z80DMA"] = true
MACHINES["Z80PIO"] = true
MACHINES["Z80STI"] = true
@@ -670,6 +679,7 @@ BUSES["VECTREX"] = true
--BUSES["VIC20"] = true
--BUSES["VIDBRAIN"] = true
--BUSES["VIP"] = true
+--BUSES["VME"] = true
--BUSES["VTECH_IOEXP"] = true
--BUSES["VTECH_MEMEXP"] = true
--BUSES["WANGPC"] = true
@@ -844,6 +854,8 @@ files {
MAME_DIR .. "src/mame/audio/dcs.h",
MAME_DIR .. "src/mame/audio/decobsmt.cpp",
MAME_DIR .. "src/mame/audio/decobsmt.h",
+ MAME_DIR .. "src/mame/audio/efo_zsu.cpp",
+ MAME_DIR .. "src/mame/audio/efo_zsu.h",
MAME_DIR .. "src/mame/audio/segam1audio.cpp",
MAME_DIR .. "src/mame/audio/segam1audio.h",
}
@@ -959,6 +971,8 @@ files {
MAME_DIR .. "src/mame/video/atarisy2.cpp",
MAME_DIR .. "src/mame/drivers/atarisy4.cpp",
MAME_DIR .. "src/mame/drivers/atarittl.cpp",
+ MAME_DIR .. "src/mame/machine/nl_stuntcyc.cpp",
+ MAME_DIR .. "src/mame/machine/nl_stuntcyc.h",
MAME_DIR .. "src/mame/drivers/atetris.cpp",
MAME_DIR .. "src/mame/includes/atetris.h",
MAME_DIR .. "src/mame/video/atetris.cpp",
@@ -1882,6 +1896,7 @@ files {
MAME_DIR .. "src/mame/machine/pgmprot_orlegend.cpp",
MAME_DIR .. "src/mame/machine/pgmprot_orlegend.h",
MAME_DIR .. "src/mame/drivers/pgm2.cpp",
+ MAME_DIR .. "src/mame/drivers/pgm3.cpp",
MAME_DIR .. "src/mame/drivers/spoker.cpp",
MAME_DIR .. "src/mame/machine/igs036crypt.cpp",
MAME_DIR .. "src/mame/machine/igs036crypt.h",
@@ -2483,10 +2498,6 @@ files {
MAME_DIR .. "src/mame/drivers/astrocde.cpp",
MAME_DIR .. "src/mame/includes/astrocde.h",
MAME_DIR .. "src/mame/video/astrocde.cpp",
- MAME_DIR .. "src/mame/audio/gorf.cpp",
- MAME_DIR .. "src/mame/audio/gorf.h",
- MAME_DIR .. "src/mame/audio/wow.cpp",
- MAME_DIR .. "src/mame/audio/wow.h",
MAME_DIR .. "src/mame/drivers/atlantis.cpp",
MAME_DIR .. "src/mame/drivers/balsente.cpp",
MAME_DIR .. "src/mame/includes/balsente.h",
@@ -2508,6 +2519,7 @@ files {
MAME_DIR .. "src/mame/includes/mcr68.h",
MAME_DIR .. "src/mame/machine/mcr68.cpp",
MAME_DIR .. "src/mame/video/mcr68.cpp",
+ MAME_DIR .. "src/mame/drivers/zwackery.cpp",
MAME_DIR .. "src/mame/drivers/midqslvr.cpp",
MAME_DIR .. "src/mame/drivers/midtunit.cpp",
MAME_DIR .. "src/mame/includes/midtunit.h",
@@ -2550,6 +2562,8 @@ files {
MAME_DIR .. "src/mame/machine/midwayic.h",
MAME_DIR .. "src/mame/audio/midway.cpp",
MAME_DIR .. "src/mame/audio/midway.h",
+ MAME_DIR .. "src/mame/audio/csd.cpp",
+ MAME_DIR .. "src/mame/audio/csd.h",
}
createMAMEProjects(_target, _subtarget, "namco")
@@ -2683,12 +2697,18 @@ files {
MAME_DIR .. "src/mame/machine/namco62.h",
MAME_DIR .. "src/mame/machine/namcomcu.cpp",
MAME_DIR .. "src/mame/machine/namcomcu.h",
+ MAME_DIR .. "src/mame/machine/namcoio_gearbox.cpp",
+ MAME_DIR .. "src/mame/machine/namcoio_gearbox.h",
+ MAME_DIR .. "src/mame/machine/namco_c148.cpp",
+ MAME_DIR .. "src/mame/machine/namco_c148.h",
+ MAME_DIR .. "src/mame/machine/namco_c139.cpp",
+ MAME_DIR .. "src/mame/machine/namco_c139.h",
MAME_DIR .. "src/mame/audio/namco52.cpp",
MAME_DIR .. "src/mame/audio/namco52.h",
MAME_DIR .. "src/mame/audio/namco54.cpp",
MAME_DIR .. "src/mame/audio/namco54.h",
- MAME_DIR .. "src/mame/video/c116.cpp",
- MAME_DIR .. "src/mame/video/c116.h",
+ MAME_DIR .. "src/mame/video/namco_c116.cpp",
+ MAME_DIR .. "src/mame/video/namco_c116.h",
MAME_DIR .. "src/mame/video/c45.cpp",
MAME_DIR .. "src/mame/video/c45.h",
}
@@ -2798,6 +2818,8 @@ files {
MAME_DIR .. "src/mame/video/dkong.cpp",
MAME_DIR .. "src/mame/drivers/mario.cpp",
MAME_DIR .. "src/mame/includes/mario.h",
+ MAME_DIR .. "src/mame/audio/nl_mario.cpp",
+ MAME_DIR .. "src/mame/audio/nl_mario.h",
MAME_DIR .. "src/mame/audio/mario.cpp",
MAME_DIR .. "src/mame/video/mario.cpp",
MAME_DIR .. "src/mame/drivers/mmagic.cpp",
@@ -2927,14 +2949,12 @@ files {
MAME_DIR .. "src/mame/drivers/pacman.cpp",
MAME_DIR .. "src/mame/includes/pacman.h",
MAME_DIR .. "src/mame/video/pacman.cpp",
- MAME_DIR .. "src/mame/machine/acitya.cpp",
- MAME_DIR .. "src/mame/machine/acitya.h",
+ MAME_DIR .. "src/mame/machine/epos.cpp",
+ MAME_DIR .. "src/mame/machine/epos.h",
MAME_DIR .. "src/mame/machine/jumpshot.cpp",
MAME_DIR .. "src/mame/machine/jumpshot.h",
MAME_DIR .. "src/mame/machine/pacplus.cpp",
MAME_DIR .. "src/mame/machine/pacplus.h",
- MAME_DIR .. "src/mame/machine/theglobp.cpp",
- MAME_DIR .. "src/mame/machine/theglobp.h",
MAME_DIR .. "src/mame/drivers/pengo.cpp",
}
@@ -3044,8 +3064,8 @@ files {
MAME_DIR .. "src/mame/video/blockade.cpp",
MAME_DIR .. "src/mame/drivers/calorie.cpp",
MAME_DIR .. "src/mame/drivers/chihiro.cpp",
- MAME_DIR .. "src/mame/includes/chihiro.h",
- MAME_DIR .. "src/mame/video/chihiro.cpp",
+ MAME_DIR .. "src/mame/includes/xbox_nv2a.h",
+ MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
MAME_DIR .. "src/mame/drivers/coolridr.cpp",
MAME_DIR .. "src/mame/drivers/deniam.cpp",
MAME_DIR .. "src/mame/includes/deniam.h",
@@ -3528,7 +3548,6 @@ files {
MAME_DIR .. "src/mame/video/asuka.cpp",
MAME_DIR .. "src/mame/drivers/bigevglf.cpp",
MAME_DIR .. "src/mame/includes/bigevglf.h",
- MAME_DIR .. "src/mame/machine/bigevglf.cpp",
MAME_DIR .. "src/mame/video/bigevglf.cpp",
MAME_DIR .. "src/mame/drivers/bking.cpp",
MAME_DIR .. "src/mame/includes/bking.h",
@@ -3539,8 +3558,8 @@ files {
MAME_DIR .. "src/mame/video/bublbobl.cpp",
MAME_DIR .. "src/mame/drivers/buggychl.cpp",
MAME_DIR .. "src/mame/includes/buggychl.h",
- MAME_DIR .. "src/mame/machine/buggychl.cpp",
- MAME_DIR .. "src/mame/machine/buggychl.h",
+ MAME_DIR .. "src/mame/machine/taito68705interface.cpp",
+ MAME_DIR .. "src/mame/machine/taito68705interface.h",
MAME_DIR .. "src/mame/video/buggychl.cpp",
MAME_DIR .. "src/mame/drivers/capr1.cpp",
MAME_DIR .. "src/mame/drivers/caprcyc.cpp",
@@ -3601,7 +3620,6 @@ files {
MAME_DIR .. "src/mame/drivers/lgp.cpp",
MAME_DIR .. "src/mame/drivers/lkage.cpp",
MAME_DIR .. "src/mame/includes/lkage.h",
- MAME_DIR .. "src/mame/machine/lkage.cpp",
MAME_DIR .. "src/mame/video/lkage.cpp",
MAME_DIR .. "src/mame/drivers/lsasquad.cpp",
MAME_DIR .. "src/mame/includes/lsasquad.h",
@@ -3623,7 +3641,6 @@ files {
MAME_DIR .. "src/mame/video/ninjaw.cpp",
MAME_DIR .. "src/mame/drivers/nycaptor.cpp",
MAME_DIR .. "src/mame/includes/nycaptor.h",
- MAME_DIR .. "src/mame/machine/nycaptor.cpp",
MAME_DIR .. "src/mame/video/nycaptor.cpp",
MAME_DIR .. "src/mame/drivers/opwolf.cpp",
MAME_DIR .. "src/mame/includes/opwolf.h",
@@ -3650,7 +3667,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",
@@ -3966,10 +3982,6 @@ files {
createMAMEProjects(_target, _subtarget, "tong")
files {
MAME_DIR .. "src/mame/drivers/beezer.cpp",
- MAME_DIR .. "src/mame/includes/beezer.h",
- MAME_DIR .. "src/mame/machine/beezer.cpp",
- MAME_DIR .. "src/mame/video/beezer.cpp",
- MAME_DIR .. "src/mame/audio/beezer.cpp",
}
createMAMEProjects(_target, _subtarget, "unico")
@@ -4341,7 +4353,6 @@ files {
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_sound.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",
@@ -4440,6 +4451,7 @@ files {
MAME_DIR .. "src/mame/includes/gumbo.h",
MAME_DIR .. "src/mame/video/gumbo.cpp",
MAME_DIR .. "src/mame/drivers/gunpey.cpp",
+ MAME_DIR .. "src/mame/drivers/hapyfish.cpp",
MAME_DIR .. "src/mame/drivers/hideseek.cpp",
MAME_DIR .. "src/mame/drivers/hazelgr.cpp",
MAME_DIR .. "src/mame/drivers/headonb.cpp",
@@ -4668,4 +4680,3 @@ files {
MAME_DIR .. "src/mame/video/xyonix.cpp",
}
end
-
diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua
index db741938f7b..bc303a90a06 100644
--- a/docs/release/scripts/target/mame/mess.lua
+++ b/docs/release/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
@@ -264,6 +265,8 @@ SOUNDS["GB_SOUND"] = true
SOUNDS["PCD3311"] = true
SOUNDS["VOLT_REG"] = true
SOUNDS["MEA8000"] = true
+--SOUNDS["DAC76"] = true
+--SOUNDS["MM5837"] = true
--------------------------------------------------
-- specify available video cores
@@ -284,6 +287,7 @@ VIDEOS["EF9340_1"] = true
VIDEOS["EF9345"] = true
VIDEOS["EF9364"] = true
VIDEOS["EF9365"] = true
+--VIDEOS["EF9369"] = true
VIDEOS["GF4500"] = true
--VIDEOS+= EPIC12"] = true
--VIDEOS+= FIXFREQ"] = true
@@ -293,10 +297,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
@@ -351,7 +357,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
@@ -373,8 +379,10 @@ MACHINES["AT45DBXX"] = true
MACHINES["ATAFLASH"] = true
MACHINES["AY31015"] = true
MACHINES["BANKDEV"] = true
+MACHINES["BIM68153"] = true
MACHINES["CDP1852"] = true
MACHINES["CDP1871"] = true
+MACHINES["CDP1879"] = true
MACHINES["CMOS40105"] = true
--MACHINES["CDU76S"] = true
MACHINES["COM8116"] = true
@@ -488,6 +496,7 @@ MACHINES["PCF8593"] = true
MACHINES["PCI"] = true
MACHINES["PCKEYBRD"] = true
MACHINES["PDC"] = true
+MACHINES["PHI"] = true
MACHINES["PIC8259"] = true
MACHINES["PIT68230"] = true
MACHINES["PIT8253"] = true
@@ -534,6 +543,7 @@ MACHINES["TTL74123"] = true
MACHINES["TTL74145"] = true
MACHINES["TTL74148"] = true
MACHINES["TTL74153"] = true
+--MACHINES["TTL74157"] = true
MACHINES["TTL74161"] = true
MACHINES["TTL74175"] = true
MACHINES["TTL74181"] = true
@@ -600,6 +610,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
@@ -697,6 +708,7 @@ BUSES["VIC10"] = true
BUSES["VIC20"] = true
BUSES["VIDBRAIN"] = true
BUSES["VIP"] = true
+BUSES["VME"] = true
BUSES["VTECH_IOEXP"] = true
BUSES["VTECH_MEMEXP"] = true
BUSES["WANGPC"] = true
@@ -721,6 +733,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
@@ -888,6 +901,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"ccs",
"chromatics",
"coleco",
+ "compugraphic",
"cromemco",
"comx",
"concept",
@@ -900,6 +914,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"dms",
"dragon",
"drc",
+ "dulmont",
"eaca",
"einis",
"elektor",
@@ -929,8 +944,10 @@ function linkProjects_mame_mess(_target, _subtarget)
"homebrew",
"homelab",
"hp",
+ "ibm6580",
"imp",
"intel",
+ "interpro",
"interton",
"intv",
"isc",
@@ -1135,8 +1152,6 @@ files {
MAME_DIR .. "src/mame/video/jagblit.h",
MAME_DIR .. "src/mame/video/jagblit.hxx",
MAME_DIR .. "src/mame/video/jagobj.hxx",
- MAME_DIR .. "src/mame/audio/gorf.cpp",
- MAME_DIR .. "src/mame/audio/wow.cpp",
MAME_DIR .. "src/mame/drivers/astrocde.cpp",
MAME_DIR .. "src/mame/includes/astrocde.h",
MAME_DIR .. "src/mame/video/astrocde.cpp",
@@ -1223,7 +1238,7 @@ files {
MAME_DIR .. "src/mame/drivers/cps1.cpp",
MAME_DIR .. "src/mame/includes/cps1.h",
MAME_DIR .. "src/mame/video/cps1.cpp",
- MAME_DIR .. "src/mame/video/chihiro.cpp",
+ MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
MAME_DIR .. "src/mame/machine/xbox.cpp",
MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
MAME_DIR .. "src/mame/includes/saturn.h",
@@ -1317,8 +1332,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")
@@ -1383,6 +1396,7 @@ files {
MAME_DIR .. "src/mame/drivers/lisa.cpp",
MAME_DIR .. "src/mame/includes/lisa.h",
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/mac.cpp",
MAME_DIR .. "src/mame/includes/mac.h",
@@ -1638,6 +1652,11 @@ files {
MAME_DIR .. "src/mame/machine/coleco.h",
}
+createMESSProjects(_target, _subtarget, "compugraphic")
+files {
+ MAME_DIR .. "src/mame/drivers/pwrview.cpp",
+}
+
createMESSProjects(_target, _subtarget, "cromemco")
files {
MAME_DIR .. "src/mame/drivers/c10.cpp",
@@ -1763,6 +1782,11 @@ files {
MAME_DIR .. "src/mame/drivers/zrt80.cpp",
}
+createMESSProjects(_target, _subtarget, "dulmont")
+files {
+ MAME_DIR .. "src/mame/drivers/magnum.cpp",
+}
+
createMESSProjects(_target, _subtarget, "eaca")
files {
MAME_DIR .. "src/mame/drivers/cgenie.cpp",
@@ -1876,13 +1900,15 @@ 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",
}
createMESSProjects(_target, _subtarget, "force")
files {
+ MAME_DIR .. "src/mame/drivers/miniforce.cpp",
+ MAME_DIR .. "src/mame/drivers/fccpu20.cpp",
MAME_DIR .. "src/mame/drivers/fccpu30.cpp",
MAME_DIR .. "src/mame/drivers/force68k.cpp",
}
@@ -2014,6 +2040,15 @@ files {
MAME_DIR .. "src/mame/drivers/hk68v10.cpp",
}
+createMESSProjects(_target, _subtarget, "ibm6580")
+files {
+ MAME_DIR .. "src/mame/drivers/ibm6580.cpp",
+ MAME_DIR .. "src/mame/machine/ibm6580_kbd.cpp",
+ MAME_DIR .. "src/mame/machine/ibm6580_kbd.h",
+ MAME_DIR .. "src/mame/machine/ibm6580_fdc.cpp",
+ MAME_DIR .. "src/mame/machine/ibm6580_fdc.h",
+}
+
createMESSProjects(_target, _subtarget, "intel")
files {
MAME_DIR .. "src/mame/drivers/basic52.cpp",
@@ -2041,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",
@@ -2218,6 +2269,7 @@ files {
createMESSProjects(_target, _subtarget, "motorola")
files {
MAME_DIR .. "src/mame/drivers/m6805evs.cpp",
+ MAME_DIR .. "src/mame/drivers/m68705prg.cpp",
MAME_DIR .. "src/mame/drivers/mekd2.cpp",
MAME_DIR .. "src/mame/drivers/mvme147.cpp",
}
@@ -2347,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",
@@ -2431,6 +2485,7 @@ files {
MAME_DIR .. "src/mame/drivers/pc.cpp",
MAME_DIR .. "src/mame/drivers/pcipc.cpp",
MAME_DIR .. "src/mame/drivers/tandy1t.cpp",
+ MAME_DIR .. "src/mame/drivers/tosh1000.cpp",
MAME_DIR .. "src/mame/video/pc_t1t.cpp",
MAME_DIR .. "src/mame/video/pc_t1t.h",
}
@@ -3272,8 +3327,8 @@ files {
MAME_DIR .. "src/mame/drivers/fanucs15.cpp",
MAME_DIR .. "src/mame/drivers/fanucspmg.cpp",
MAME_DIR .. "src/mame/drivers/fc100.cpp",
- MAME_DIR .. "src/mame/drivers/fcisio.cpp",
- MAME_DIR .. "src/mame/drivers/fcscsi.cpp",
+-- MAME_DIR .. "src/mame/drivers/fcisio.cpp",
+-- MAME_DIR .. "src/mame/drivers/fcscsi.cpp",
MAME_DIR .. "src/mame/drivers/fk1.cpp",
MAME_DIR .. "src/mame/drivers/ft68m.cpp",
MAME_DIR .. "src/mame/drivers/gamate.cpp",
@@ -3291,7 +3346,6 @@ files {
MAME_DIR .. "src/mame/drivers/hunter2.cpp",
MAME_DIR .. "src/mame/drivers/i7000.cpp",
MAME_DIR .. "src/mame/drivers/ibm3153.cpp",
- MAME_DIR .. "src/mame/drivers/ibm6580.cpp",
MAME_DIR .. "src/mame/drivers/icatel.cpp",
MAME_DIR .. "src/mame/drivers/ie15.cpp",
MAME_DIR .. "src/mame/machine/ie15_kbd.cpp",
@@ -3325,10 +3379,11 @@ files {
MAME_DIR .. "src/mame/drivers/ms9540.cpp",
MAME_DIR .. "src/mame/drivers/mstation.cpp",
MAME_DIR .. "src/mame/drivers/mt735.cpp",
- MAME_DIR .. "src/mame/drivers/mvme350.cpp",
MAME_DIR .. "src/mame/drivers/mx2178.cpp",
MAME_DIR .. "src/mame/drivers/mycom.cpp",
MAME_DIR .. "src/mame/drivers/myvision.cpp",
+ MAME_DIR .. "src/mame/machine/nl_hazelvid.cpp",
+ MAME_DIR .. "src/mame/machine/nl_hazelvid.h",
MAME_DIR .. "src/mame/drivers/notetaker.cpp",
MAME_DIR .. "src/mame/drivers/ngen.cpp",
MAME_DIR .. "src/mame/machine/ngen_kb.cpp",
@@ -3386,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
diff --git a/docs/release/scripts/target/mame/nl.lua b/docs/release/scripts/target/mame/nl.lua
index 8242f67c38e..9ea0dfb1966 100644
--- a/docs/release/scripts/target/mame/nl.lua
+++ b/docs/release/scripts/target/mame/nl.lua
@@ -21,6 +21,7 @@ CPUS["M6800"] = true
CPUS["M6803"] = true
CPUS["M6809"] = true
CPUS["MCS48"] = true
+CPUS["I8085"] = true
--CPUS["MCS51"] = true
--CPUS["M6800"] = true
--CPUS["M6809"] = true
@@ -60,6 +61,10 @@ VIDEOS["FIXFREQ"] = true
MACHINES["NETLIST"] = true
MACHINES["Z80DMA"] = true
MACHINES["GEN_LATCH"] = true
+MACHINES["AY31015"] = true
+MACHINES["KB3600"] = true
+MACHINES["COM8116"] = true
+
--MACHINES["6821PIA"] = true
--MACHINES["TTL74148"] = true
--MACHINES["TTL74153"] = true
@@ -112,6 +117,14 @@ files{
MAME_DIR .. "src/mame/machine/nl_pongd.h",
MAME_DIR .. "src/mame/machine/nl_breakout.cpp",
MAME_DIR .. "src/mame/machine/nl_breakout.h",
+ MAME_DIR .. "src/mame/machine/nl_hazelvid.cpp",
+ MAME_DIR .. "src/mame/machine/nl_hazelvid.h",
+
+ MAME_DIR .. "src/mame/drivers/atarittl.cpp",
+ MAME_DIR .. "src/mame/machine/nl_stuntcyc.cpp",
+ MAME_DIR .. "src/mame/machine/nl_stuntcyc.h",
+
+ MAME_DIR .. "src/mame/drivers/hazeltin.cpp",
MAME_DIR .. "src/mame/drivers/1942.cpp",
MAME_DIR .. "src/mame/includes/1942.h",
@@ -121,10 +134,12 @@ files{
MAME_DIR .. "src/mame/includes/popeye.h",
MAME_DIR .. "src/mame/video/popeye.cpp",
- MAME_DIR .. "src/mame/drivers/mario.cpp",
- MAME_DIR .. "src/mame/includes/mario.h",
- MAME_DIR .. "src/mame/video/mario.cpp",
- MAME_DIR .. "src/mame/audio/mario.cpp",
+ MAME_DIR .. "src/mame/drivers/mario.cpp",
+ MAME_DIR .. "src/mame/includes/mario.h",
+ MAME_DIR .. "src/mame/audio/nl_mario.cpp",
+ MAME_DIR .. "src/mame/audio/nl_mario.h",
+ MAME_DIR .. "src/mame/video/mario.cpp",
+ MAME_DIR .. "src/mame/audio/mario.cpp",
MAME_DIR .. "src/mame/drivers/m62.cpp",
MAME_DIR .. "src/mame/includes/m62.h",
@@ -133,6 +148,7 @@ files{
MAME_DIR .. "src/mame/audio/irem.h",
MAME_DIR .. "src/mame/audio/nl_kidniki.cpp",
MAME_DIR .. "src/mame/audio/nl_kidniki.h",
+
}
end
diff --git a/docs/release/scripts/target/mame/tiny.lua b/docs/release/scripts/target/mame/tiny.lua
index 0e770933bef..129e276e208 100644
--- a/docs/release/scripts/target/mame/tiny.lua
+++ b/docs/release/scripts/target/mame/tiny.lua
@@ -139,8 +139,6 @@ 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/gorf.cpp",
- MAME_DIR .. "src/mame/audio/wow.cpp",
MAME_DIR .. "src/mame/drivers/gaelco.cpp",
MAME_DIR .. "src/mame/includes/gaelco.h",
MAME_DIR .. "src/mame/video/gaelco.cpp",