summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/check_include_guards.py51
-rwxr-xr-xscripts/build/complay.py22
-rw-r--r--scripts/build/verinfo.py4
-rw-r--r--scripts/genie.lua132
-rw-r--r--scripts/minimaws/lib/__init__.py2
-rw-r--r--scripts/minimaws/lib/assets/common.js1
-rw-r--r--scripts/minimaws/lib/assets/digest.js1
-rw-r--r--scripts/minimaws/lib/assets/machine.js1
-rw-r--r--scripts/minimaws/lib/assets/romident.js1
-rw-r--r--scripts/minimaws/lib/auxverbs.py4
-rw-r--r--scripts/minimaws/lib/dbaccess.py20
-rw-r--r--scripts/minimaws/lib/htmltmpl.py2
-rw-r--r--scripts/minimaws/lib/lxparse.py26
-rw-r--r--scripts/minimaws/lib/wsgiserve.py92
-rwxr-xr-xscripts/minimaws/minimaws.py2
-rwxr-xr-xscripts/src/3rdparty.lua155
-rw-r--r--scripts/src/bus.lua525
-rw-r--r--scripts/src/cpu.lua391
-rw-r--r--scripts/src/emu.lua22
-rw-r--r--scripts/src/formats.lua50
-rw-r--r--scripts/src/lib.lua2
-rw-r--r--scripts/src/machine.lua335
-rw-r--r--scripts/src/main.lua16
-rw-r--r--scripts/src/mame/frontend.lua10
-rw-r--r--scripts/src/osd/mac.lua2
-rw-r--r--scripts/src/osd/modules.lua85
-rw-r--r--scripts/src/osd/sdl.lua17
-rw-r--r--scripts/src/osd/sdl_cfg.lua8
-rw-r--r--scripts/src/osd/windows_cfg.lua10
-rw-r--r--scripts/src/sound.lua257
-rw-r--r--scripts/src/tools.lua4
-rw-r--r--scripts/src/video.lua235
-rw-r--r--scripts/target/mame/mame.lua2
-rw-r--r--scripts/target/mame/tiny.lua2
-rw-r--r--scripts/toolchain.lua19
35 files changed, 1790 insertions, 718 deletions
diff --git a/scripts/build/check_include_guards.py b/scripts/build/check_include_guards.py
new file mode 100755
index 00000000000..bcc1bd889e9
--- /dev/null
+++ b/scripts/build/check_include_guards.py
@@ -0,0 +1,51 @@
+#!/usr/bin/python3
+##
+## icense:BSD-3-Clause
+## copyright-holders:Vas Crabb
+
+import io
+import os
+import os.path
+import re
+import sys
+
+
+def pathsplit(p):
+ result = [ ]
+ while p:
+ d, n = os.path.split(p)
+ if not n:
+ result.insert(0, d)
+ break
+ else:
+ result.insert(0, n)
+ p = d
+ return result
+
+
+if __name__ == '__main__':
+ extpat = re.compile('.+\\.(h|hpp)$')
+ substpat = re.compile('[-.]')
+ guardpat = re.compile('^ *# *ifndef +([^\s]+)(\s+.*)?')
+ bad = False
+ if len(sys.argv) < 2:
+ sys.stderr.write("Error: requires at least one path defined\n")
+ sys.exit(2)
+
+ for root in sys.argv[1:]:
+ for path, subdirs, files in os.walk(root):
+ prefix = 'MAME_' + '_'.join([n.upper() for n in pathsplit(os.path.relpath(path, root))]) + '_'
+ for f in files:
+ if extpat.match(f):
+ expected = prefix + substpat.sub('_', f.upper())
+ fp = os.path.join(path, f)
+ with io.open(fp, 'r', encoding='utf-8') as fd:
+ for l in fd:
+ m = guardpat.match(l)
+ if m:
+ if m.group(1) != expected:
+ sys.stderr.write('%s: #include guard does not appear to match expected %s\n' % (fp, expected))
+ bad = True
+ break
+ if bad:
+ sys.exit(1)
diff --git a/scripts/build/complay.py b/scripts/build/complay.py
index 475806c0e65..6519a01de06 100755
--- a/scripts/build/complay.py
+++ b/scripts/build/complay.py
@@ -174,6 +174,17 @@ class LayoutChecker(Minifyer):
self.handle_error('Element %s attribute %s "%s" is not a number' % (name, key, val))
return None
+ def check_bool_attribute(self, name, attrs, key, default):
+ if key not in attrs:
+ return default
+ val = attrs[key]
+ if self.VARPATTERN.match(val):
+ return None
+ elif val in self.YESNO:
+ return 'yes' == val
+ self.handle_error('Element %s attribute %s "%s" is not "yes" or "no"' % (name, key, val))
+ return None
+
def check_parameter(self, attrs):
if 'name' not in attrs:
self.handle_error('Element param missing attribute name')
@@ -253,8 +264,7 @@ class LayoutChecker(Minifyer):
if self.check_int_attribute('orientation', attrs, 'rotate', 0) not in self.ORIENTATIONS:
self.handle_error('Element orientation attribute rotate "%s" is unsupported' % (attrs['rotate'], ))
for name in ('swapxy', 'flipx', 'flipy'):
- if (attrs.get(name, 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs[name])):
- self.handle_error('Element orientation attribute %s "%s" is not "yes" or "no"' % (name, attrs[name]))
+ self.check_bool_attribute('orientation', attrs, name, None)
def check_color(self, attrs):
self.check_color_channel(attrs, 'red')
@@ -324,8 +334,8 @@ class LayoutChecker(Minifyer):
self.handle_error('Element %s has inputraw attribute without inputtag attribute' % (name, ))
inputmask = self.check_int_attribute(name, attrs, 'inputmask', None)
if (inputmask is not None) and (not inputmask):
- if (inputraw is None) or (not inputraw):
- self.handle_error('Element %s attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
+ self.handle_error('Element %s attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
+ self.check_bool_attribute(name, attrs, 'clickthrough', None)
def startViewItem(self, name):
self.handlers.append((self.viewItemStartHandler, self.viewItemEndHandler))
@@ -399,6 +409,7 @@ class LayoutChecker(Minifyer):
self.views[attrs['name']] = self.format_location()
elif not self.VARPATTERN.match(attrs['name']):
self.handle_error('Element view has duplicate name "%s" (previous %s)' % (attrs['name'], self.views[attrs['name']]))
+ self.check_bool_attribute(name, attrs, 'showpointers', None)
self.handlers.append((self.groupViewStartHandler, self.groupViewEndHandler))
self.variable_scopes.append({ })
self.item_ids = { }
@@ -676,8 +687,7 @@ class LayoutChecker(Minifyer):
else:
have_scroll[-1] = self.format_location()
self.check_float_attribute(name, attrs, 'size', 1.0)
- if (attrs.get('wrap', 'no') not in self.YESNO) and (not self.VARPATTERN.match(attrs['wrap'])):
- self.handle_error('Element %s attribute wrap "%s" is not "yes" or "no"' % (name, attrs['wrap']))
+ self.check_bool_attribute(name, attrs, 'wrap', False)
if 'inputtag' in attrs:
if 'name' in attrs:
self.handle_error('Element %s has both attribute inputtag and attribute name' % (name, ))
diff --git a/scripts/build/verinfo.py b/scripts/build/verinfo.py
index 4b05d860406..68038b6251b 100644
--- a/scripts/build/verinfo.py
+++ b/scripts/build/verinfo.py
@@ -23,7 +23,7 @@ def parse_args():
def extract_version(verinfo):
- pattern = re.compile('\s+BARE_BUILD_VERSION\s+"(([^."]+)\.([^."]+))"')
+ pattern = re.compile(r'\s+BARE_BUILD_VERSION\s+"(([^."]+)\.([^."]+))"')
for line in verinfo:
match = pattern.search(line)
if match:
@@ -122,7 +122,7 @@ if __name__ == '__main__':
original=options.executable,
product=('MAME' if options.target == 'mame' else options.target),
rdns=('org.mamedev.' + internal),
- copyright='\u00a9 1997-2023 MAMEdev and contributors',
+ copyright='\u00a9 1997-2025 MAMEdev and contributors',
winfileflags=('0x0L' if verbuild == '0' else 'VS_FF_PRERELEASE'),
resources=(options.resources or 'mame.rc'))
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 3a6a2bfd38b..819b753e794 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -158,16 +158,6 @@ newoption {
}
newoption {
- trigger = "distro",
- description = "Choose distribution",
- allowed = {
- { "generic", "generic" },
- { "debian-stable", "debian-stable" },
- { "ubuntu-intrepid", "ubuntu-intrepid" },
- },
-}
-
-newoption {
trigger = "target",
description = "Building target",
}
@@ -570,21 +560,9 @@ configuration { "gmake or ninja" }
dofile ("toolchain.lua")
-if _OPTIONS["targetos"]=="windows" then
- configuration { "x64" }
- defines {
- "X64_WINDOWS_ABI",
- }
- configuration { }
-end
-
-- Avoid error when invoking genie --help.
if (_ACTION == nil) then return false end
--- define PTR64 if we are a 64-bit target
-configuration { "x64 or android-*64"}
- defines { "PTR64=1" }
-
-- define MAME_DEBUG if we are a debugging build
configuration { "Debug" }
defines {
@@ -702,24 +680,22 @@ else
}
end
-if _OPTIONS["NOASM"]=="1" then
+if _OPTIONS["NOASM"] == "1" then
defines {
"MAME_NOASM"
}
end
-if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
- if _OPTIONS["BIGENDIAN"]~="1" then
- configuration { "x64" }
- defines {
- "NATIVE_DRC=drcbe_x64",
- }
- configuration { "x32" }
- defines {
- "NATIVE_DRC=drcbe_x86",
- }
- configuration { }
- end
+if _OPTIONS["FORCE_DRC_C_BACKEND"] then
+ configuration { }
+ defines {
+ "NATIVE_DRC=drcbe_c",
+ }
+elseif (_OPTIONS["PLATFORM"] == "x86") or (_OPTIONS["PLATFORM"] == "arm64") then
+ configuration { }
+ defines {
+ "ASMJIT_STATIC",
+ }
end
defines {
@@ -1035,29 +1011,23 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
- if version < 60000 then
- print("Clang version 6.0 or later needed")
+ if version < 70000 then
+ print("Clang version 7.0 or later needed")
os.exit(-1)
end
buildoptions {
"-fdiagnostics-show-note-include-stack",
+ "-Wno-error=tautological-compare",
"-Wno-cast-align",
"-Wno-constant-logical-operand",
"-Wno-extern-c-compat",
"-Wno-ignored-qualifiers",
"-Wno-pragma-pack", -- clang 6.0 complains when the packing change lifetime is not contained within a header file.
- "-Wno-tautological-compare",
"-Wno-unknown-attributes",
"-Wno-unknown-warning-option",
"-Wno-unused-value",
"-Wno-unused-const-variable",
}
- if (version < 70000) or ((version < 100001) and (_OPTIONS["targetos"] == 'macosx')) then
- buildoptions { -- clang 6.0 complains that [[maybe_unused]] is ignored for static data members
- "-Wno-error=ignored-attributes",
- "-Wno-error=unused-const-variable",
- }
- end
if ((version >= 100000) and (_OPTIONS["targetos"] ~= 'macosx')) or (version >= 120000) then
buildoptions {
"-Wno-xor-used-as-pow", -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention
@@ -1069,8 +1039,8 @@ end
}
end
else
- if version < 70000 then
- print("GCC version 7.0 or later needed")
+ if version < 100300 then
+ print("GCC version 10.3 or later needed")
os.exit(-1)
end
buildoptions_cpp {
@@ -1082,23 +1052,11 @@ end
buildoptions {
"-Wno-error=unused-result", -- needed for fgets,fread on linux
-- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds)
- "-Wno-array-bounds",
+ "-Wno-error=array-bounds",
"-Wno-error=attributes", -- GCC fails to recognize some uses of [[maybe_unused]]
+ "-Wno-error=stringop-truncation", -- ImGui again
+ "-Wno-stringop-overflow", -- generates false positives when assigning an int rvalue to a u8 variable without an explicit cast
}
- if version < 100300 then
- buildoptions_cpp {
- "-flifetime-dse=1", -- GCC 10.2 and earlier take issue with Sol's get<std::optional<T> >() otherwise - possibly an issue with libstdc++ itself
- }
- end
- if version >= 80000 then
- buildoptions {
- "-Wno-stringop-truncation", -- ImGui again
- "-Wno-stringop-overflow", -- formats/victor9k_dsk.cpp bugs the compiler
- }
- buildoptions_cpp {
- "-Wno-class-memaccess", -- many instances in ImGui and BGFX
- }
- end
if version >= 110000 then
buildoptions {
"-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists
@@ -1119,12 +1077,6 @@ end
end
end
-if (_OPTIONS["PLATFORM"]=="alpha") then
- defines {
- "PTR64=1",
- }
-end
-
if (_OPTIONS["PLATFORM"]=="arm") then
buildoptions {
"-Wno-cast-align",
@@ -1135,21 +1087,6 @@ if (_OPTIONS["PLATFORM"]=="arm64") then
buildoptions {
"-Wno-cast-align",
}
- defines {
- "PTR64=1",
- }
-end
-
-if (_OPTIONS["PLATFORM"]=="riscv64") then
- defines {
- "PTR64=1",
- }
-end
-
-if (_OPTIONS["PLATFORM"]=="mips64") then
- defines {
- "PTR64=1",
- }
end
local subdir
@@ -1173,31 +1110,32 @@ configuration { "asmjs" }
"-std=c++17",
"-s EXCEPTION_CATCHING_ALLOWED=\"['_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']\"",
}
+ defines {
+ "ASIO_HAS_PTHREADS",
+ }
linkoptions {
"-Wl,--start-group",
"-O" .. _OPTIONS["OPTIMIZE"],
"-s USE_SDL=2",
"-s USE_SDL_TTF=2",
- "--memory-init-file 0",
"-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=\"['\\$$ERRNO_CODES']\"",
"-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 EXPORTED_RUNTIME_METHODS=\"['cwrap']\"",
"-s ERROR_ON_UNDEFINED_SYMBOLS=0",
- "-s USE_WEBGL2=1",
- "-s LEGACY_GL_EMULATION=1",
- "-s GL_UNSAFE_OPTS=0",
+ "-s STACK_SIZE=5MB",
+ "-s MAX_WEBGL_VERSION=2",
"--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",
"--embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects",
"--embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/essl@bgfx/shaders/essl",
"--embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/bgfx@artwork/bgfx",
+ "--embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/lut-default.png@artwork/lut-default.png",
"--embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png",
}
if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then
linkoptions {
"-g" .. _OPTIONS["SYMLEVEL"],
- "-s DEMANGLE_SUPPORT=1",
}
end
if _OPTIONS["WEBASSEMBLY"] then
@@ -1213,11 +1151,12 @@ configuration { "asmjs" }
-- define a fixed memory size because allowing memory growth disables asm.js optimizations
linkoptions {
"-s ALLOW_MEMORY_GROWTH=0",
- "-s TOTAL_MEMORY=268435456",
+ "-s INITIAL_MEMORY=256MB",
}
else
linkoptions {
"-s ALLOW_MEMORY_GROWTH=1",
+ "-s INITIAL_MEMORY=24MB"
}
end
archivesplit_size "20"
@@ -1237,12 +1176,6 @@ configuration { "linux-*" }
flags {
"LinkSupportCircularDependencies",
}
- if _OPTIONS["distro"]=="debian-stable" then
- defines
- {
- "NO_AFFINITY_NP",
- }
- end
configuration { "freebsd or netbsd" }
@@ -1305,12 +1238,13 @@ configuration { "vs20*" }
}
buildoptions {
+ "/Zc:preprocessor",
+ "/utf-8",
+ "/permissive-",
"/w45038", -- warning C5038: data member 'member1' will be initialized after data member 'member2'
}
buildoptions {
- "/wd4003", -- warning C4003: not enough actual parameters for macro 'xxx'
- "/wd4005", -- warning C4005: The macro identifier is defined twice. The compiler uses the second macro definition
"/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch
"/wd4060", -- warning C4060: switch statement contains no 'case' or 'default' labels
"/wd4065", -- warning C4065: switch statement contains 'default' but no 'case' labels
@@ -1322,6 +1256,7 @@ configuration { "vs20*" }
"/wd4245", -- warning C4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
"/wd4250", -- warning C4250: 'xxx' : inherits 'xxx' via dominance
"/wd4267", -- warning C4267: 'var' : conversion from 'size_t' to 'type', possible loss of data
+ "/wd4305", -- warning C4305: 'conversion': truncation from 'type1' to 'type2'
"/wd4310", -- warning C4310: cast truncates constant value
"/wd4319", -- warning C4319: 'operator' : zero extending 'type' to 'type' of greater size
"/wd4324", -- warning C4324: 'xxx' : structure was padded due to __declspec(align())
@@ -1332,10 +1267,11 @@ configuration { "vs20*" }
"/wd4458", -- warning C4458: declaration of 'xxx' hides class member
"/wd4459", -- warning C4459: declaration of 'xxx' hides global declaration
"/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
+ "/wd4646", -- warning C4646: function declared with 'noreturn' has non-void return type
+ "/wd4701", -- warning C4701: potentially uninitialized local variable 'name' used
"/wd4702", -- warning C4702: unreachable code
- "/wd4706", -- warning C4706: assignment within conditional expression
- "/wd4804", -- warning C4804: '>>': unsafe use of type 'bool' in operation
"/wd4805", -- warning C4805: 'x' : unsafe mix of type 'xxx' and type 'xxx' in operation
+ "/wd4806", -- warning C4806: 'operation': unsafe operation: no value of type 'type' promoted to type 'type' can equal the given constant
"/wd4996", -- warning C4996: 'function': was declared deprecated
}
diff --git a/scripts/minimaws/lib/__init__.py b/scripts/minimaws/lib/__init__.py
index d89cb7f81ba..a8a22f4dbfe 100644
--- a/scripts/minimaws/lib/__init__.py
+++ b/scripts/minimaws/lib/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
diff --git a/scripts/minimaws/lib/assets/common.js b/scripts/minimaws/lib/assets/common.js
index 7439aaa5a21..3b10b785fdd 100644
--- a/scripts/minimaws/lib/assets/common.js
+++ b/scripts/minimaws/lib/assets/common.js
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
+'use strict';
function make_collapsible(heading, section)
{
diff --git a/scripts/minimaws/lib/assets/digest.js b/scripts/minimaws/lib/assets/digest.js
index 6739d1440d9..91285ff529f 100644
--- a/scripts/minimaws/lib/assets/digest.js
+++ b/scripts/minimaws/lib/assets/digest.js
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
+'use strict';
function Crc32Digester()
{
diff --git a/scripts/minimaws/lib/assets/machine.js b/scripts/minimaws/lib/assets/machine.js
index b7f600f04d6..b488ae9e9a4 100644
--- a/scripts/minimaws/lib/assets/machine.js
+++ b/scripts/minimaws/lib/assets/machine.js
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
+'use strict';
var slot_info = Object.create(null);
var bios_sets = Object.create(null);
diff --git a/scripts/minimaws/lib/assets/romident.js b/scripts/minimaws/lib/assets/romident.js
index 599b0674007..892894ced56 100644
--- a/scripts/minimaws/lib/assets/romident.js
+++ b/scripts/minimaws/lib/assets/romident.js
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
+'use strict';
var matched_names = new Array();
var unmatched_names = new Array();
diff --git a/scripts/minimaws/lib/auxverbs.py b/scripts/minimaws/lib/auxverbs.py
index 50e4dacddd3..f4a4ebbe70c 100644
--- a/scripts/minimaws/lib/auxverbs.py
+++ b/scripts/minimaws/lib/auxverbs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
@@ -17,7 +17,7 @@ import zlib
class _Identifier(object):
def __init__(self, dbcurs, **kwargs):
- super(_Identifier, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.dbcurs = dbcurs
self.shortnamewidth = 0
self.pathwidth = 0
diff --git a/scripts/minimaws/lib/dbaccess.py b/scripts/minimaws/lib/dbaccess.py
index 3cfbec0c508..74c1cdb6d1e 100644
--- a/scripts/minimaws/lib/dbaccess.py
+++ b/scripts/minimaws/lib/dbaccess.py
@@ -1,13 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
import sqlite3
-import sys
-
-if sys.version_info >= (3, 4):
- import urllib.request
+import urllib.request
class SchemaQueries(object):
@@ -574,7 +571,7 @@ class UpdateQueries(object):
class QueryCursor(object):
def __init__(self, dbconn, **kwargs):
- super(QueryCursor, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.dbcurs = dbconn.cursor()
def close(self):
@@ -916,7 +913,7 @@ class QueryCursor(object):
class UpdateCursor(object):
def __init__(self, dbconn, **kwargs):
- super(UpdateCursor, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.dbcurs = dbconn.cursor()
def close(self):
@@ -1066,11 +1063,8 @@ class UpdateCursor(object):
class QueryConnection(object):
def __init__(self, database, **kwargs):
- super(QueryConnection, self).__init__(**kwargs)
- if sys.version_info >= (3, 4):
- self.dbconn = sqlite3.connect('file:' + urllib.request.pathname2url(database) + '?mode=ro', uri=True, check_same_thread=False)
- else:
- self.dbconn = sqlite3.connect(database, check_same_thread=False)
+ super().__init__(**kwargs)
+ self.dbconn = sqlite3.connect('file:' + urllib.request.pathname2url(database) + '?mode=ro', uri=True, check_same_thread=False)
self.dbconn.row_factory = sqlite3.Row
self.dbconn.execute('PRAGMA foreign_keys = ON')
@@ -1083,7 +1077,7 @@ class QueryConnection(object):
class UpdateConnection(object):
def __init__(self, database, **kwargs):
- super(UpdateConnection, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.dbconn = sqlite3.connect(database)
self.dbconn.execute('PRAGMA page_size = 4096')
self.dbconn.execute('PRAGMA foreign_keys = ON')
diff --git a/scripts/minimaws/lib/htmltmpl.py b/scripts/minimaws/lib/htmltmpl.py
index 62e1bbcf1ea..c6489e27349 100644
--- a/scripts/minimaws/lib/htmltmpl.py
+++ b/scripts/minimaws/lib/htmltmpl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
diff --git a/scripts/minimaws/lib/lxparse.py b/scripts/minimaws/lib/lxparse.py
index e773669080d..11c9a15f451 100644
--- a/scripts/minimaws/lib/lxparse.py
+++ b/scripts/minimaws/lib/lxparse.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
@@ -14,7 +14,7 @@ import xml.sax.saxutils
class ElementHandlerBase(object):
def __init__(self, parent, **kwargs):
- super(ElementHandlerBase, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.dbconn = parent.dbconn if parent is not None else None
self.locator = parent.locator if parent is not None else None
self.depth = 0
@@ -105,7 +105,7 @@ class ElementHandler(ElementHandlerBase):
class TextAccumulator(ElementHandler):
def __init__(self, parent, **kwargs):
- super(TextAccumulator, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.text = ''
def mainCharacters(self, content):
@@ -114,7 +114,7 @@ class TextAccumulator(ElementHandler):
class DipSwitchHandler(ElementHandler):
def __init__(self, parent, **kwargs):
- super(DipSwitchHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.machine = parent.id
@@ -138,7 +138,7 @@ class DipSwitchHandler(ElementHandler):
class SlotHandler(ElementHandler):
def __init__(self, parent, **kwargs):
- super(SlotHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.machine = parent.id
@@ -155,7 +155,7 @@ class SlotHandler(ElementHandler):
class RamOptionHandler(TextAccumulator):
def __init__(self, parent, **kwargs):
- super(RamOptionHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.machine = parent.id
@@ -181,7 +181,7 @@ class MachineHandler(ElementHandler):
'ramoption': RamOptionHandler }
def __init__(self, parent, **kwargs):
- super(MachineHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = self.dbconn.cursor()
def startMainElement(self, name, attrs):
@@ -248,7 +248,7 @@ class MachineHandler(ElementHandler):
class ListXmlHandler(ElementHandler):
def __init__(self, dbconn, **kwargs):
- super(ListXmlHandler, self).__init__(parent=None, **kwargs)
+ super().__init__(parent=None, **kwargs)
self.dbconn = dbconn
def startDocument(self):
@@ -290,7 +290,7 @@ class ListXmlHandler(ElementHandler):
class DataAreaHandler(ElementHandler):
def __init__(self, parent, **kwargs):
- super(DataAreaHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.part = parent.id
@@ -309,7 +309,7 @@ class DataAreaHandler(ElementHandler):
class DiskAreaHandler(ElementHandler):
def __init__(self, parent, **kwargs):
- super(DiskAreaHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.part = parent.id
@@ -330,7 +330,7 @@ class SoftwarePartHandler(ElementHandler):
'diskarea': DiskAreaHandler }
def __init__(self, parent, **kwargs):
- super(SoftwarePartHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = parent.dbcurs
self.software = parent.id
@@ -356,7 +356,7 @@ class SoftwareHandler(ElementHandler):
'part': SoftwarePartHandler }
def __init__(self, parent, **kwargs):
- super(SoftwareHandler, self).__init__(parent=parent, **kwargs)
+ super().__init__(parent=parent, **kwargs)
self.dbcurs = self.dbconn.cursor()
self.softwarelist = parent.id
@@ -400,7 +400,7 @@ class SoftwareListHandler(ElementHandler):
'software': SoftwareHandler }
def __init__(self, dbconn, **kwargs):
- super(SoftwareListHandler, self).__init__(parent=None, **kwargs)
+ super().__init__(parent=None, **kwargs)
self.dbconn = dbconn
def startDocument(self):
diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py
index 1158528d954..56197407516 100644
--- a/scripts/minimaws/lib/wsgiserve.py
+++ b/scripts/minimaws/lib/wsgiserve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
@@ -6,7 +6,7 @@
from . import dbaccess
from . import htmltmpl
-import cgi
+import html
import inspect
import json
import mimetypes
@@ -14,20 +14,14 @@ import os.path
import re
import sys
import urllib
+import urllib.parse
import wsgiref.util
-if hasattr(cgi, 'escape'):
- htmlescape = cgi.escape
-else:
- import html
- htmlescape = html.escape
-
-try:
- import urllib.parse as urlparse
- urlquote = urlparse.quote
-except ImportError:
- import urlparse
- urlquote = urllib.quote
+htmlescape = html.escape
+shiftpath = wsgiref.util.shift_path_info
+urljoin = urllib.parse.urljoin
+urlparsequery = urllib.parse.parse_qs
+urlquote = urllib.parse.quote
class HandlerBase(object):
@@ -45,7 +39,7 @@ class HandlerBase(object):
505: 'HTTP Version Not Supported' }
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(HandlerBase, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.app = app
self.js_escape = app.js_escape
self.application_uri = application_uri
@@ -58,7 +52,7 @@ class HandlerBase(object):
class ErrorPageHandler(HandlerBase):
def __init__(self, code, app, application_uri, environ, start_response, **kwargs):
- super(ErrorPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.code = code
self.start_response('%d %s' % (self.code, self.STATUS_MESSAGE[code]), [('Content-type', 'text/html; charset=utf-8'), ('Cache-Control', 'public, max-age=3600')])
@@ -70,9 +64,9 @@ class AssetHandler(HandlerBase):
EXTENSIONMAP = { '.js': 'application/javascript', '.svg': 'image/svg+xml' }
def __init__(self, directory, app, application_uri, environ, start_response, **kwargs):
- super(AssetHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.directory = directory
- self.asset = wsgiref.util.shift_path_info(environ)
+ self.asset = shiftpath(environ)
def __iter__(self):
if not self.asset:
@@ -105,20 +99,20 @@ class AssetHandler(HandlerBase):
class QueryPageHandler(HandlerBase):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.dbcurs = app.dbconn.cursor()
def machine_href(self, shortname):
- return htmlescape(urlparse.urljoin(self.application_uri, 'machine/%s' % (urlquote(shortname), )), True)
+ return htmlescape(urljoin(self.application_uri, 'machine/%s' % (urlquote(shortname), )), True)
def sourcefile_href(self, sourcefile):
- return htmlescape(urlparse.urljoin(self.application_uri, 'sourcefile/%s' % (urlquote(sourcefile), )), True)
+ return htmlescape(urljoin(self.application_uri, 'sourcefile/%s' % (urlquote(sourcefile), )), True)
def softwarelist_href(self, softwarelist):
- return htmlescape(urlparse.urljoin(self.application_uri, 'softwarelist/%s' % (urlquote(softwarelist), )), True)
+ return htmlescape(urljoin(self.application_uri, 'softwarelist/%s' % (urlquote(softwarelist), )), True)
def software_href(self, softwarelist, software):
- return htmlescape(urlparse.urljoin(self.application_uri, 'softwarelist/%s/%s' % (urlquote(softwarelist), urlquote(software))), True)
+ return htmlescape(urljoin(self.application_uri, 'softwarelist/%s/%s' % (urlquote(softwarelist), urlquote(software))), True)
def bios_data(self, machine):
result = { }
@@ -197,8 +191,8 @@ class QueryPageHandler(HandlerBase):
class MachineRpcHandlerBase(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(MachineRpcHandlerBase, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
- self.shortname = wsgiref.util.shift_path_info(environ)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ self.shortname = shiftpath(environ)
def __iter__(self):
if not self.shortname:
@@ -222,8 +216,8 @@ class MachineRpcHandlerBase(QueryPageHandler):
class MachineHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(MachineHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
- self.shortname = wsgiref.util.shift_path_info(environ)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ self.shortname = shiftpath(environ)
def __iter__(self):
if not self.shortname:
@@ -250,7 +244,7 @@ class MachineHandler(QueryPageHandler):
description = machine_info['description']
yield htmltmpl.MACHINE_PROLOGUE.substitute(
app=self.js_escape(htmlescape(self.application_uri, True)),
- assets=self.js_escape(htmlescape(urlparse.urljoin(self.application_uri, 'static'), True)),
+ assets=self.js_escape(htmlescape(urljoin(self.application_uri, 'static'), True)),
sourcehref=self.sourcefile_href(machine_info['sourcefile']),
description=htmlescape(description),
shortname=htmlescape(self.shortname),
@@ -470,7 +464,7 @@ class MachineHandler(QueryPageHandler):
class SourceFileHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(SourceFileHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
def __iter__(self):
self.filename = self.environ['PATH_INFO']
@@ -514,7 +508,7 @@ class SourceFileHandler(QueryPageHandler):
heading = self.linked_title(pattern)
title = 'Source Files: ' + htmlescape(pattern)
yield htmltmpl.SOURCEFILE_LIST_PROLOGUE.substitute(
- assets=htmlescape(urlparse.urljoin(self.application_uri, 'static'), True),
+ assets=htmlescape(urljoin(self.application_uri, 'static'), True),
title=title,
heading=heading).encode('utf-8')
for filename, machines in self.dbcurs.get_sourcefiles(pattern):
@@ -525,7 +519,7 @@ class SourceFileHandler(QueryPageHandler):
def sourcefile_page(self, id):
yield htmltmpl.SOURCEFILE_PROLOGUE.substitute(
- assets=htmlescape(urlparse.urljoin(self.application_uri, 'static'), True),
+ assets=htmlescape(urljoin(self.application_uri, 'static'), True),
filename=htmlescape(self.filename),
title=self.linked_title(self.filename)).encode('utf-8')
@@ -558,13 +552,13 @@ class SourceFileHandler(QueryPageHandler):
parts = filename.split('/')
final = parts[-1]
del parts[-1]
- uri = urlparse.urljoin(self.application_uri, 'sourcefile')
+ uri = urljoin(self.application_uri, 'sourcefile')
title = ''
for part in parts:
- uri = urlparse.urljoin(uri + '/', urlquote(part))
+ uri = urljoin(uri + '/', urlquote(part))
title += '<a href="{0}">{1}</a>/'.format(htmlescape(uri, True), htmlescape(part))
if linkfinal:
- uri = urlparse.urljoin(uri + '/', urlquote(final))
+ uri = urljoin(uri + '/', urlquote(final))
return title + '<a href="{0}">{1}</a>'.format(htmlescape(uri, True), htmlescape(final))
else:
return title + final
@@ -583,9 +577,9 @@ class SourceFileHandler(QueryPageHandler):
class SoftwareListHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(SoftwareListHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
- self.shortname = wsgiref.util.shift_path_info(environ)
- self.software = wsgiref.util.shift_path_info(environ)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ self.shortname = shiftpath(environ)
+ self.software = shiftpath(environ)
def __iter__(self):
if self.environ['PATH_INFO']:
@@ -627,7 +621,7 @@ class SoftwareListHandler(QueryPageHandler):
else:
title = heading = 'Software Lists: ' + htmlescape(pattern)
yield htmltmpl.SOFTWARELIST_LIST_PROLOGUE.substitute(
- assets=htmlescape(urlparse.urljoin(self.application_uri, 'static'), True),
+ assets=htmlescape(urljoin(self.application_uri, 'static'), True),
title=title,
heading=heading).encode('utf-8')
for shortname, description, total, supported, partiallysupported, unsupported in self.dbcurs.get_softwarelists(pattern):
@@ -649,7 +643,7 @@ class SoftwareListHandler(QueryPageHandler):
title = 'Software List: %s (%s): %s' % (htmlescape(softwarelist_info['description']), htmlescape(softwarelist_info['shortname']), htmlescape(pattern))
heading = '<a href="%s">%s</a>: %s' % (self.softwarelist_href(softwarelist_info['shortname']), htmlescape(softwarelist_info['description']), htmlescape(pattern))
yield htmltmpl.SOFTWARELIST_PROLOGUE.substitute(
- assets=htmlescape(urlparse.urljoin(self.application_uri, 'static'), True),
+ assets=htmlescape(urljoin(self.application_uri, 'static'), True),
title=title,
heading=heading,
shortname=htmlescape(softwarelist_info['shortname']),
@@ -707,7 +701,7 @@ class SoftwareListHandler(QueryPageHandler):
def software_page(self, software_info):
yield htmltmpl.SOFTWARE_PROLOGUE.substitute(
- assets=htmlescape(urlparse.urljoin(self.application_uri, 'static'), True),
+ assets=htmlescape(urljoin(self.application_uri, 'static'), True),
title=htmlescape(software_info['description']),
heading=htmlescape(software_info['description']),
softwarelisthref=self.softwarelist_href(self.shortname),
@@ -794,7 +788,7 @@ class SoftwareListHandler(QueryPageHandler):
class RomIdentHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(QueryPageHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
self.dbcurs = app.dbconn.cursor()
def __iter__(self):
@@ -811,7 +805,7 @@ class RomIdentHandler(QueryPageHandler):
def form_page(self):
yield htmltmpl.ROMIDENT_PAGE.substitute(
app=self.js_escape(htmlescape(self.application_uri, True)),
- assets=self.js_escape(htmlescape(urlparse.urljoin(self.application_uri, 'static'), True))).encode('utf-8')
+ assets=self.js_escape(htmlescape(urljoin(self.application_uri, 'static'), True))).encode('utf-8')
class BiosRpcHandler(MachineRpcHandlerBase):
@@ -839,7 +833,7 @@ class SoftwareListsRpcHandler(MachineRpcHandlerBase):
class RomDumpsRpcHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(RomDumpsRpcHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
def __iter__(self):
if self.environ['PATH_INFO']:
@@ -850,7 +844,7 @@ class RomDumpsRpcHandler(QueryPageHandler):
return self.error_page(405)
else:
try:
- args = urlparse.parse_qs(self.environ['QUERY_STRING'], keep_blank_values=True, strict_parsing=True)
+ args = urlparsequery(self.environ['QUERY_STRING'], keep_blank_values=True, strict_parsing=True)
crc = args.get('crc')
sha1 = args.get('sha1')
if (len(args) == 2) and (crc is not None) and (len(crc) == 1) and (sha1 is not None) and (len(sha1) == 1):
@@ -896,7 +890,7 @@ class RomDumpsRpcHandler(QueryPageHandler):
class DiskDumpsRpcHandler(QueryPageHandler):
def __init__(self, app, application_uri, environ, start_response, **kwargs):
- super(DiskDumpsRpcHandler, self).__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
+ super().__init__(app=app, application_uri=application_uri, environ=environ, start_response=start_response, **kwargs)
def __iter__(self):
if self.environ['PATH_INFO']:
@@ -907,7 +901,7 @@ class DiskDumpsRpcHandler(QueryPageHandler):
return self.error_page(405)
else:
try:
- args = urlparse.parse_qs(self.environ['QUERY_STRING'], keep_blank_values=True, strict_parsing=True)
+ args = urlparsequery(self.environ['QUERY_STRING'], keep_blank_values=True, strict_parsing=True)
sha1 = args.get('sha1')
if (len(args) == 1) and (sha1 is not None) and (len(sha1) == 1):
sha1 = sha1[0]
@@ -960,7 +954,7 @@ class MiniMawsApp(object):
'diskdumps': DiskDumpsRpcHandler }
def __init__(self, dbfile, **kwargs):
- super(MiniMawsApp, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.dbconn = dbaccess.QueryConnection(dbfile)
self.assetsdir = os.path.join(os.path.dirname(inspect.getfile(self.__class__)), 'assets')
if not mimetypes.inited:
@@ -970,7 +964,7 @@ class MiniMawsApp(object):
application_uri = wsgiref.util.application_uri(environ)
if application_uri[-1] != '/':
application_uri += '/'
- module = wsgiref.util.shift_path_info(environ)
+ module = shiftpath(environ)
if module == 'machine':
return MachineHandler(self, application_uri, environ, start_response)
elif module == 'sourcefile':
@@ -982,7 +976,7 @@ class MiniMawsApp(object):
elif module == 'static':
return AssetHandler(self.assetsdir, self, application_uri, environ, start_response)
elif module == 'rpc':
- service = wsgiref.util.shift_path_info(environ)
+ service = shiftpath(environ)
if not service:
return ErrorPageHandler(403, self, application_uri, environ, start_response)
elif service in self.RPC_SERVICES:
diff --git a/scripts/minimaws/minimaws.py b/scripts/minimaws/minimaws.py
index 2d91cdcf1a8..72e1803ed8e 100755
--- a/scripts/minimaws/minimaws.py
+++ b/scripts/minimaws/minimaws.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
##
## license:BSD-3-Clause
## copyright-holders:Vas Crabb
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 64a8e3b7ab6..b08e847a9ae 100755
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -22,21 +22,24 @@ project "expat"
-- fake out the enough of expat_config.h to get by
-- could possibly add more defines here for specific targets
defines {
+ "HAVE_CXX11",
"HAVE_MEMMOVE",
"HAVE_STDINT_H",
+ "HAVE_STDIO_H",
"HAVE_STDLIB_H",
"HAVE_STRING_H",
"PACKAGE=\"expat\"",
- "PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"",
+ "PACKAGE_BUGREPORT=\"https://github.com/libexpat/libexpat/issues\"",
"PACKAGE_NAME=\"expat\"",
- "PACKAGE_STRING=\"expat 2.2.10\"",
+ "PACKAGE_STRING=\"expat-2.7.1\"",
"PACKAGE_TARNAME=\"expat\"",
"PACKAGE_URL=\"\"",
- "PACKAGE_VERSION=\"2.2.10\"",
+ "PACKAGE_VERSION=\"2.7.1\"",
"STDC_HEADERS",
- "VERSION=\"2.2.10\"",
+ "VERSION=\"2.7.1\"",
"XML_CONTEXT_BYTES=1024",
"XML_DTD",
+ "XML_GE=1",
"XML_NS",
}
if _OPTIONS["BIGENDIAN"]=="1" then
@@ -49,6 +52,11 @@ else
"BYTEORDER=1234",
}
end
+if _OPTIONS["targetos"]=="windows" then
+ defines {
+ "__USE_MINGW_ANSI_STDIO=0",
+ }
+end
if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="freebsd" then
defines {
"HAVE_ARC4RANDOM",
@@ -88,7 +96,7 @@ if _OPTIONS["gcc"]~=nil then
else
buildoptions_c {
- "-Wno-maybe-uninitialized", -- expat in GCC 11.1
+ "-Wno-error=maybe-uninitialized", -- expat in GCC 11.1
}
end
end
@@ -285,6 +293,7 @@ project "softfloat3"
MAME_DIR .. "3rdparty/softfloat3/source",
MAME_DIR .. "3rdparty/softfloat3/source/include",
MAME_DIR .. "3rdparty/softfloat3/source/8086",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext"
}
configuration { "gmake or ninja" }
@@ -313,6 +322,11 @@ end
"SOFTFLOAT_FAST_INT64"
}
+if _OPTIONS["BIGENDIAN"]~="1" then
+ defines {
+ "LITTLEENDIAN=1"
+ }
+end
files {
MAME_DIR .. "3rdparty/softfloat3/source/s_eq128.c",
MAME_DIR .. "3rdparty/softfloat3/source/s_le128.c",
@@ -615,6 +629,13 @@ end
MAME_DIR .. "3rdparty/softfloat3/source/f128M_eq_signaling.c",
MAME_DIR .. "3rdparty/softfloat3/source/f128M_le_quiet.c",
MAME_DIR .. "3rdparty/softfloat3/source/f128M_lt_quiet.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/f2xm1.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fpatan.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fprem.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fsincos.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fyl2x.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/poly.c",
+ MAME_DIR .. "3rdparty/softfloat3/bochs_ext/extF80_scale.c",
}
@@ -707,6 +728,7 @@ project "flac"
configuration { "vs*" }
buildoptions {
+ "/wd4057", -- warning C4057: 'operator': 'identifier1' differs in indirection to slightly different base types from 'identifier2'
"/wd4127", -- warning C4127: conditional expression is constant
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
@@ -853,6 +875,7 @@ project "7z"
configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-error=undef",
+ "-Wno-error=strict-prototypes",
}
if _OPTIONS["gcc"]~=nil then
if string.find(_OPTIONS["gcc"], "clang") then
@@ -955,6 +978,7 @@ project "lua"
configuration { "vs*" }
buildoptions {
+ "/wd4101", -- warning C4101: 'identifier': unreferenced local variable
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
"/wd4702", -- warning C4702: unreachable code
"/wd4310", -- warning C4310: cast truncates constant value
@@ -1046,6 +1070,7 @@ project "lualibs"
configuration { "vs*" }
buildoptions {
+ "/wd4101", -- warning C4101: 'identifier': unreferenced local variable
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
"/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx'
"/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression
@@ -1163,14 +1188,16 @@ end
defines {
"PMALSA=1",
}
-
configuration { }
- if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") and str_to_version(_OPTIONS["gcc_version"]) >= 150000 then
+ configuration { "gmake or ninja" }
buildoptions_c {
- "-Wno-strict-prototypes",
+ "-Wno-unknown-pragmas",
+ "-Wno-unused-but-set-variable",
+ "-Wno-unused-function",
+ "-Wno-unused-variable",
}
- end
+ configuration { }
files {
MAME_DIR .. "3rdparty/portmidi/pm_common/portmidi.c",
@@ -1207,7 +1234,6 @@ end
MAME_DIR .. "3rdparty/portmidi/pm_mac/pmmacosxcm.c",
MAME_DIR .. "3rdparty/portmidi/pm_mac/finddefault.c",
MAME_DIR .. "3rdparty/portmidi/pm_mac/readbinaryplist.c",
- MAME_DIR .. "3rdparty/portmidi/pm_mac/osxsupport.m",
MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c",
}
end
@@ -1370,12 +1396,24 @@ project "bimg"
"BX_CONFIG_DEBUG=0",
}
- configuration { "x64", "mingw*", "not arm64" }
- defines {
- "ASTCENC_AVX=0",
- "ASTCENC_SSE=20",
- }
- configuration { }
+ if _OPTIONS["gcc"]~=nil and not string.find(_OPTIONS["gcc"], "clang") then
+ -- This is a gross hack. For some reason GitHub Actions MinGW GCC seems to define SSE feature macros for features that are not enabled.
+ local archopts = (_OPTIONS["ARCHOPTS"] or "") .. " " .. (_OPTIONS["ARCHOPTS_CXX"] or "")
+ local ssever = "20"
+ if string.find(archopts, "-msse4.2") then
+ ssever = "42"
+ elseif string.find(archopts, "-msse4.1") then
+ ssever = "41"
+ elseif string.find(archopts, "-msse3") then
+ ssever = "30"
+ end
+ configuration { "x64", "mingw*", "not arm64" }
+ defines {
+ "ASTCENC_AVX=0",
+ "ASTCENC_SSE=" .. ssever,
+ }
+ configuration { }
+ end
configuration { "x32" }
defines {
@@ -1486,7 +1524,7 @@ end
MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
- configuration { "linux*" }
+ configuration { "linux*", "not mingw*" }
includedirs {
MAME_DIR .. "3rdparty/bgfx/3rdparty/directx-headers/include/wsl/stubs",
MAME_DIR .. "3rdparty/bx/include/compat/linux",
@@ -1498,6 +1536,7 @@ end
"-Wno-unused-but-set-variable",
"-Wno-unused-function",
"-Wno-unused-variable",
+ "-Wno-tautological-compare",
}
configuration { }
@@ -1558,13 +1597,8 @@ end
defines {
"WL_EGL_PLATFORM=1",
}
- end
- end
-
- if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then
- if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then
- defines {
- "TARGET_OS_OSX=1",
+ buildoptions {
+ backtick(pkgconfigcmd() .. " --cflags wayland-egl-backend"),
}
end
end
@@ -1913,7 +1947,7 @@ project "ymfm"
-- asmjit library
--------------------------------------------------
-if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
+if (not _OPTIONS["FORCE_DRC_C_BACKEND"]) and ((_OPTIONS["PLATFORM"] == "x86") or (_OPTIONS["PLATFORM"] == "arm64")) then
project "asmjit"
uuid "4539757c-6e99-4bae-b3d0-b342a7c49539"
kind "StaticLib"
@@ -1926,23 +1960,13 @@ project "asmjit"
end
configuration { }
-
- if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then
- if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then
- defines {
- "TARGET_OS_OSX=1",
- }
- end
- end
+ defines {
+ "ASMJIT_STATIC",
+ }
files {
MAME_DIR .. "3rdparty/asmjit/src/asmjit/a64.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-begin.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-end.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64archtraits_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64assembler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64assembler.h",
@@ -1950,28 +1974,32 @@ project "asmjit"
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64builder.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64compiler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64compiler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emitter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64globals.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64operand.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64operand.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64utils.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armglobals.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armoperand.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armutils.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-begin.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-end.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/api-build_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/api-config.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archcommons.h",
@@ -1979,13 +2007,14 @@ project "asmjit"
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archtraits.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/assembler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/assembler.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codebuffer.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codeholder.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codeholder.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compiler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compiler.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compilerdefs.h",
@@ -1993,27 +2022,29 @@ project "asmjit"
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/constpool.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/cpuinfo.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/cpuinfo.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/environment.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/environment.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/errorhandler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/errorhandler.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/func.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/func.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/globals.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/globals.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/inst.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/inst.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/instdb_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/instdb.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitallocator.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitallocator.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitruntime.cpp",
@@ -2023,20 +2054,21 @@ project "asmjit"
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/misc_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/operand.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/operand.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/raassignment_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rabuilders_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/radefs_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/string.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/string.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/target.cpp",
@@ -2058,6 +2090,7 @@ project "asmjit"
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/zonetree.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/zonevector.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/zonevector.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86archtraits_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86assembler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86assembler.h",
@@ -2065,23 +2098,23 @@ project "asmjit"
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86builder.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86compiler.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86compiler.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emitter.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter_p.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86globals.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi.cpp",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86opcode_p.h",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86operand.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86operand.h",
- MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp",
MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass_p.h",
+ MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp",
}
end
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 9742cd6d2c5..e5fc0680d78 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -488,10 +488,6 @@ end
--@src/devices/bus/ata/ataintf.h,BUSES["ATA"] = true
---------------------------------------------------
-if (MACHINES["ATAFLASH"]~=null) then
- BUSES["ATA"] = true
-end
-
if (BUSES["ATA"]~=null) then
files {
MAME_DIR .. "src/devices/bus/ata/atadev.cpp",
@@ -512,6 +508,8 @@ if (BUSES["ATA"]~=null) then
MAME_DIR .. "src/devices/bus/ata/hdd.h",
MAME_DIR .. "src/devices/bus/ata/px320a.cpp",
MAME_DIR .. "src/devices/bus/ata/px320a.h",
+ MAME_DIR .. "src/devices/bus/ata/xm3301.cpp",
+ MAME_DIR .. "src/devices/bus/ata/xm3301.h",
MAME_DIR .. "src/devices/bus/ata/zip100.cpp",
MAME_DIR .. "src/devices/bus/ata/zip100.h",
}
@@ -706,6 +704,8 @@ if (BUSES["BBC_1MHZBUS"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/2ndserial.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/autoprom.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/autoprom.h",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/barrybox.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/barrybox.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebopl.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebopl.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebsid.cpp",
@@ -804,6 +804,8 @@ if (BUSES["BBC_TUBE"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/tube/tube_casper.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_cms6809.cpp",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_cms6809.h",
+ MAME_DIR .. "src/devices/bus/bbc/tube/tube_matchbox.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/tube/tube_matchbox.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_rc6502.cpp",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_rc6502.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_x25.cpp",
@@ -829,6 +831,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/lvlecho.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/userport/lvlecho.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",
@@ -1174,6 +1178,8 @@ if (BUSES["COLECO_CART"]~=null) then
files {
MAME_DIR .. "src/devices/bus/coleco/cartridge/exp.cpp",
MAME_DIR .. "src/devices/bus/coleco/cartridge/exp.h",
+ MAME_DIR .. "src/devices/bus/coleco/cartridge/activision.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/cartridge/activision.h",
MAME_DIR .. "src/devices/bus/coleco/cartridge/megacart.cpp",
MAME_DIR .. "src/devices/bus/coleco/cartridge/megacart.h",
MAME_DIR .. "src/devices/bus/coleco/cartridge/std.cpp",
@@ -1186,6 +1192,23 @@ end
---------------------------------------------------
--
+--@src/devices/bus/coleco/expansion/expansion.h,BUSES["COLECO_EXPANSION"] = true
+---------------------------------------------------
+
+if (BUSES["COLECO_EXPANSION"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/coleco/expansion/expansion.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/expansion/expansion.h",
+ MAME_DIR .. "src/devices/bus/coleco/expansion/cards.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/expansion/cards.h",
+ MAME_DIR .. "src/devices/bus/coleco/expansion/sgm.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/expansion/sgm.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/crvision/slot.h,BUSES["CRVISION"] = true
---------------------------------------------------
@@ -1394,6 +1417,27 @@ end
---------------------------------------------------
--
+--@src/devices/bus/fp1000/fp1000_exp.h,BUSES["FP1000"] = true
+---------------------------------------------------
+
+if (BUSES["FP1000"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/fp1000/fp1000_exp.cpp",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1000_exp.h",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1020fd.cpp",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1020fd.h",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1030_rampack.cpp",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1030_rampack.h",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1060io.cpp",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1060io.h",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1060io_exp.cpp",
+ MAME_DIR .. "src/devices/bus/fp1000/fp1060io_exp.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/gamate/slot.h,BUSES["GAMATE"] = true
---------------------------------------------------
@@ -1467,6 +1511,10 @@ if (BUSES["HPDIO"]~=null) then
MAME_DIR .. "src/devices/bus/hp_dio/hp98603b.h",
MAME_DIR .. "src/devices/bus/hp_dio/hp98620.cpp",
MAME_DIR .. "src/devices/bus/hp_dio/hp98620.h",
+ MAME_DIR .. "src/devices/bus/hp_dio/hp98624.cpp",
+ MAME_DIR .. "src/devices/bus/hp_dio/hp98624.h",
+ MAME_DIR .. "src/devices/bus/hp_dio/hp98628_9.cpp",
+ MAME_DIR .. "src/devices/bus/hp_dio/hp98628_9.h",
MAME_DIR .. "src/devices/bus/hp_dio/hp98643.cpp",
MAME_DIR .. "src/devices/bus/hp_dio/hp98643.h",
MAME_DIR .. "src/devices/bus/hp_dio/hp98644.cpp",
@@ -1512,6 +1560,22 @@ end
---------------------------------------------------
--
+--@src/devices/bus/idpartner/bus.h,BUSES["IDPARTNER"] = true
+---------------------------------------------------
+
+if (BUSES["IDPARTNER"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/idpartner/bus.cpp",
+ MAME_DIR .. "src/devices/bus/idpartner/bus.h",
+ MAME_DIR .. "src/devices/bus/idpartner/gdp.cpp",
+ MAME_DIR .. "src/devices/bus/idpartner/gdp.h",
+ MAME_DIR .. "src/devices/bus/idpartner/sasi.cpp",
+ MAME_DIR .. "src/devices/bus/idpartner/sasi.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/ieee488/ieee488.h,BUSES["IEEE488"] = true
---------------------------------------------------
@@ -1541,6 +1605,8 @@ if (BUSES["IEEE488"]~=null) then
MAME_DIR .. "src/devices/bus/ieee488/shark.h",
MAME_DIR .. "src/devices/bus/ieee488/hp9122c.cpp",
MAME_DIR .. "src/devices/bus/ieee488/hp9122c.h",
+ MAME_DIR .. "src/devices/bus/ieee488/hp9133.cpp",
+ MAME_DIR .. "src/devices/bus/ieee488/hp9133.h",
MAME_DIR .. "src/devices/bus/ieee488/hp9895.cpp",
MAME_DIR .. "src/devices/bus/ieee488/hp9895.h",
MAME_DIR .. "src/devices/bus/ieee488/remote488.cpp",
@@ -1784,6 +1850,8 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/pds.h",
MAME_DIR .. "src/devices/bus/isa/pgc.cpp",
MAME_DIR .. "src/devices/bus/isa/pgc.h",
+ MAME_DIR .. "src/devices/bus/isa/prose4k1.cpp",
+ MAME_DIR .. "src/devices/bus/isa/prose4k1.h",
MAME_DIR .. "src/devices/bus/isa/sb16.cpp",
MAME_DIR .. "src/devices/bus/isa/sb16.h",
MAME_DIR .. "src/devices/bus/isa/sblaster.cpp",
@@ -1863,6 +1931,32 @@ end
---------------------------------------------------
--
+--@src/devices/bus/mpf1/slot.h,BUSES["MPF1"] = true
+---------------------------------------------------
+
+if (BUSES["MPF1"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/mpf1/slot.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/slot.h",
+ MAME_DIR .. "src/devices/bus/mpf1/epb.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/epb.h",
+ MAME_DIR .. "src/devices/bus/mpf1/iom.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/iom.h",
+ MAME_DIR .. "src/devices/bus/mpf1/prt.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/prt.h",
+ MAME_DIR .. "src/devices/bus/mpf1/sgb.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/sgb.h",
+ MAME_DIR .. "src/devices/bus/mpf1/ssb.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/ssb.h",
+ MAME_DIR .. "src/devices/bus/mpf1/tva.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/tva.h",
+ MAME_DIR .. "src/devices/bus/mpf1/vid.cpp",
+ MAME_DIR .. "src/devices/bus/mpf1/vid.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/msx/ctrl/ctrl.h,BUSES["MSX_CTRL"] = true
---------------------------------------------------
@@ -1876,6 +1970,8 @@ if (BUSES["MSX_CTRL"]~=null) then
MAME_DIR .. "src/devices/bus/msx/ctrl/joystick.h",
MAME_DIR .. "src/devices/bus/msx/ctrl/libbler.cpp",
MAME_DIR .. "src/devices/bus/msx/ctrl/libbler.h",
+ MAME_DIR .. "src/devices/bus/msx/ctrl/magickey.cpp",
+ MAME_DIR .. "src/devices/bus/msx/ctrl/magickey.h",
MAME_DIR .. "src/devices/bus/msx/ctrl/mouse.cpp",
MAME_DIR .. "src/devices/bus/msx/ctrl/mouse.h",
MAME_DIR .. "src/devices/bus/msx/ctrl/sgadapt.cpp",
@@ -1918,6 +2014,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/devices/bus/msx/slot/music.h",
MAME_DIR .. "src/devices/bus/msx/slot/panasonic08.cpp",
MAME_DIR .. "src/devices/bus/msx/slot/panasonic08.h",
+ MAME_DIR .. "src/devices/bus/msx/slot/panasonic08r.cpp",
+ MAME_DIR .. "src/devices/bus/msx/slot/panasonic08r.h",
MAME_DIR .. "src/devices/bus/msx/slot/rom.cpp",
MAME_DIR .. "src/devices/bus/msx/slot/rom.h",
MAME_DIR .. "src/devices/bus/msx/slot/ram.cpp",
@@ -1952,6 +2050,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/devices/bus/msx/cart/easi_speech.h",
MAME_DIR .. "src/devices/bus/msx/cart/fmpac.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/fmpac.h",
+ MAME_DIR .. "src/devices/bus/msx/cart/franky.cpp",
+ MAME_DIR .. "src/devices/bus/msx/cart/franky.h",
MAME_DIR .. "src/devices/bus/msx/cart/fs_sr021.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/fs_sr021.h",
MAME_DIR .. "src/devices/bus/msx/cart/fs_sr022.cpp",
@@ -1964,6 +2064,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/devices/bus/msx/cart/hfox.h",
MAME_DIR .. "src/devices/bus/msx/cart/holy_quran.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/holy_quran.h",
+ MAME_DIR .. "src/devices/bus/msx/cart/ide.cpp",
+ MAME_DIR .. "src/devices/bus/msx/cart/ide.h",
MAME_DIR .. "src/devices/bus/msx/cart/ink.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/ink.h",
MAME_DIR .. "src/devices/bus/msx/cart/kanji.cpp",
@@ -2006,6 +2108,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/devices/bus/msx/cart/superloderunner.h",
MAME_DIR .. "src/devices/bus/msx/cart/super_swangi.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/super_swangi.h",
+ MAME_DIR .. "src/devices/bus/msx/cart/video80.h",
+ MAME_DIR .. "src/devices/bus/msx/cart/video80.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/yamaha_ucn01.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/yamaha_ucn01.h",
MAME_DIR .. "src/devices/bus/msx/minicart/minicart.cpp",
@@ -2053,6 +2157,8 @@ if (BUSES["MC10"]~=null) then
MAME_DIR .. "src/devices/bus/mc10/mc10_cart.h",
MAME_DIR .. "src/devices/bus/mc10/mcx128.cpp",
MAME_DIR .. "src/devices/bus/mc10/mcx128.h",
+ MAME_DIR .. "src/devices/bus/mc10/multiports_ext.cpp",
+ MAME_DIR .. "src/devices/bus/mc10/multiports_ext.h",
MAME_DIR .. "src/devices/bus/mc10/pak.cpp",
MAME_DIR .. "src/devices/bus/mc10/pak.h",
MAME_DIR .. "src/devices/bus/mc10/ram.cpp",
@@ -2148,6 +2254,29 @@ end
---------------------------------------------------
--
+--@src/devices/bus/pccard/pccard.h,BUSES["PCCARD"] = true
+---------------------------------------------------
+
+if (BUSES["PCCARD"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/pccard/pccard.cpp",
+ MAME_DIR .. "src/devices/bus/pccard/pccard.h",
+ MAME_DIR .. "src/devices/bus/pccard/ataflash.cpp",
+ MAME_DIR .. "src/devices/bus/pccard/ataflash.h",
+ MAME_DIR .. "src/devices/bus/pccard/k573npu.cpp",
+ MAME_DIR .. "src/devices/bus/pccard/k573npu.h",
+ MAME_DIR .. "src/devices/bus/pccard/konami_dual.cpp",
+ MAME_DIR .. "src/devices/bus/pccard/konami_dual.h",
+ MAME_DIR .. "src/devices/bus/pccard/linflash.cpp",
+ MAME_DIR .. "src/devices/bus/pccard/linflash.h",
+ MAME_DIR .. "src/devices/bus/pccard/sram.cpp",
+ MAME_DIR .. "src/devices/bus/pccard/sram.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/pc_kbd/pc_kbdc.h,BUSES["PC_KBD"] = true
---------------------------------------------------
@@ -2276,6 +2405,10 @@ if (BUSES["PSION_HONDA"]~=null) then
files {
MAME_DIR .. "src/devices/bus/psion/honda/slot.cpp",
MAME_DIR .. "src/devices/bus/psion/honda/slot.h",
+ MAME_DIR .. "src/devices/bus/psion/honda/parallel.cpp",
+ MAME_DIR .. "src/devices/bus/psion/honda/parallel.h",
+ MAME_DIR .. "src/devices/bus/psion/honda/pclink.cpp",
+ MAME_DIR .. "src/devices/bus/psion/honda/pclink.h",
MAME_DIR .. "src/devices/bus/psion/honda/ssd.cpp",
MAME_DIR .. "src/devices/bus/psion/honda/ssd.h",
}
@@ -2291,6 +2424,8 @@ if (BUSES["PSION_MODULE"]~=null) then
files {
MAME_DIR .. "src/devices/bus/psion/module/slot.cpp",
MAME_DIR .. "src/devices/bus/psion/module/slot.h",
+ MAME_DIR .. "src/devices/bus/psion/module/serpar.cpp",
+ MAME_DIR .. "src/devices/bus/psion/module/serpar.h",
}
end
@@ -2397,6 +2532,25 @@ end
---------------------------------------------------
--
+--@src/devices/bus/segaai/segaai_exp.h,BUSES["SEGAAI"] = true
+---------------------------------------------------
+
+if (BUSES["SEGAAI"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/segaai/rom.cpp",
+ MAME_DIR .. "src/devices/bus/segaai/rom.h",
+ MAME_DIR .. "src/devices/bus/segaai/segaai_exp.cpp",
+ MAME_DIR .. "src/devices/bus/segaai/segaai_exp.h",
+ MAME_DIR .. "src/devices/bus/segaai/segaai_slot.cpp",
+ MAME_DIR .. "src/devices/bus/segaai/segaai_slot.h",
+ MAME_DIR .. "src/devices/bus/segaai/soundbox.cpp",
+ MAME_DIR .. "src/devices/bus/segaai/soundbox.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/spc1000/exp.h,BUSES["SPC1000"] = true
---------------------------------------------------
@@ -2436,6 +2590,20 @@ if (BUSES["SS50"]~=null) then
}
end
+---------------------------------------------------
+--
+--@src/devices/bus/supracan/slot.h,BUSES["SUPRACAN"] = true
+---------------------------------------------------
+
+if (BUSES["SUPRACAN"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/supracan/slot.cpp",
+ MAME_DIR .. "src/devices/bus/supracan/slot.h",
+ MAME_DIR .. "src/devices/bus/supracan/rom.cpp",
+ MAME_DIR .. "src/devices/bus/supracan/rom.h",
+ }
+end
+
---------------------------------------------------
--
@@ -2456,6 +2624,21 @@ end
---------------------------------------------------
--
+--@src/devices/bus/tim011/exp.h,BUSES["TIM011"] = true
+---------------------------------------------------
+
+if (BUSES["TIM011"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/tim011/exp.cpp",
+ MAME_DIR .. "src/devices/bus/tim011/exp.h",
+ MAME_DIR .. "src/devices/bus/tim011/aycard.cpp",
+ MAME_DIR .. "src/devices/bus/tim011/aycard.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/tvc/tvc.h,BUSES["TVC"] = true
---------------------------------------------------
@@ -2516,6 +2699,8 @@ if (BUSES["VCS_CTRL"]~=null) then
files {
MAME_DIR .. "src/devices/bus/vcs_ctrl/ctrl.cpp",
MAME_DIR .. "src/devices/bus/vcs_ctrl/ctrl.h",
+ MAME_DIR .. "src/devices/bus/vcs_ctrl/cx85.cpp",
+ MAME_DIR .. "src/devices/bus/vcs_ctrl/cx85.h",
MAME_DIR .. "src/devices/bus/vcs_ctrl/joystick.cpp",
MAME_DIR .. "src/devices/bus/vcs_ctrl/joystick.h",
MAME_DIR .. "src/devices/bus/vcs_ctrl/joybooster.cpp",
@@ -2528,6 +2713,8 @@ if (BUSES["VCS_CTRL"]~=null) then
MAME_DIR .. "src/devices/bus/vcs_ctrl/mouse.h",
MAME_DIR .. "src/devices/bus/vcs_ctrl/paddles.cpp",
MAME_DIR .. "src/devices/bus/vcs_ctrl/paddles.h",
+ MAME_DIR .. "src/devices/bus/vcs_ctrl/trakball.cpp",
+ MAME_DIR .. "src/devices/bus/vcs_ctrl/trakball.h",
MAME_DIR .. "src/devices/bus/vcs_ctrl/wheel.cpp",
MAME_DIR .. "src/devices/bus/vcs_ctrl/wheel.h",
}
@@ -2692,6 +2879,8 @@ if (BUSES["VME"]~=null) then
MAME_DIR .. "src/devices/bus/vme/mvme187.h",
MAME_DIR .. "src/devices/bus/vme/mvme327a.cpp",
MAME_DIR .. "src/devices/bus/vme/mvme327a.h",
+ MAME_DIR .. "src/devices/bus/vme/mvme328.cpp",
+ MAME_DIR .. "src/devices/bus/vme/mvme328.h",
MAME_DIR .. "src/devices/bus/vme/mvme350.cpp",
MAME_DIR .. "src/devices/bus/vme/mvme350.h",
MAME_DIR .. "src/devices/bus/vme/mzr8105.cpp",
@@ -2710,6 +2899,8 @@ if (BUSES["VME"]~=null) then
MAME_DIR .. "src/devices/bus/vme/sys68k_iscsi.h",
MAME_DIR .. "src/devices/bus/vme/sys68k_isio.cpp",
MAME_DIR .. "src/devices/bus/vme/sys68k_isio.h",
+ MAME_DIR .. "src/devices/bus/vme/tp880v.cpp",
+ MAME_DIR .. "src/devices/bus/vme/tp880v.h",
MAME_DIR .. "src/devices/bus/vme/tp881v.cpp",
MAME_DIR .. "src/devices/bus/vme/tp881v.h",
}
@@ -2870,6 +3061,8 @@ if (BUSES["A2BUS"]~=null) then
MAME_DIR .. "src/devices/bus/a2bus/a2videoterm.h",
MAME_DIR .. "src/devices/bus/a2bus/a2vulcan.cpp",
MAME_DIR .. "src/devices/bus/a2bus/a2vulcan.h",
+ MAME_DIR .. "src/devices/bus/a2bus/a2wico_trackball.cpp",
+ MAME_DIR .. "src/devices/bus/a2bus/a2wico_trackball.h",
MAME_DIR .. "src/devices/bus/a2bus/a2zipdrive.cpp",
MAME_DIR .. "src/devices/bus/a2bus/a2zipdrive.h",
MAME_DIR .. "src/devices/bus/a2bus/ace2x00.cpp",
@@ -2932,6 +3125,8 @@ if (BUSES["A2BUS"]~=null) then
MAME_DIR .. "src/devices/bus/a2bus/romcard.h",
MAME_DIR .. "src/devices/bus/a2bus/sider.cpp",
MAME_DIR .. "src/devices/bus/a2bus/sider.h",
+ MAME_DIR .. "src/devices/bus/a2bus/snesmax.cpp",
+ MAME_DIR .. "src/devices/bus/a2bus/snesmax.h",
MAME_DIR .. "src/devices/bus/a2bus/softcard3.cpp",
MAME_DIR .. "src/devices/bus/a2bus/softcard3.h",
MAME_DIR .. "src/devices/bus/a2bus/ssbapple.cpp",
@@ -2962,6 +3157,8 @@ end
if (BUSES["A2GAMEIO"]~=null) then
files {
+ MAME_DIR .. "src/devices/bus/a2gameio/brightpen.cpp",
+ MAME_DIR .. "src/devices/bus/a2gameio/brightpen.h",
MAME_DIR .. "src/devices/bus/a2gameio/computereyes.cpp",
MAME_DIR .. "src/devices/bus/a2gameio/computereyes.h",
MAME_DIR .. "src/devices/bus/a2gameio/gameio.cpp",
@@ -2970,10 +3167,14 @@ if (BUSES["A2GAMEIO"]~=null) then
MAME_DIR .. "src/devices/bus/a2gameio/joystick.h",
MAME_DIR .. "src/devices/bus/a2gameio/joyport.cpp",
MAME_DIR .. "src/devices/bus/a2gameio/joyport.h",
+ MAME_DIR .. "src/devices/bus/a2gameio/joyport_paddles.cpp",
+ MAME_DIR .. "src/devices/bus/a2gameio/joyport_paddles.h",
MAME_DIR .. "src/devices/bus/a2gameio/paddles.cpp",
MAME_DIR .. "src/devices/bus/a2gameio/paddles.h",
MAME_DIR .. "src/devices/bus/a2gameio/gizmo.cpp",
MAME_DIR .. "src/devices/bus/a2gameio/gizmo.h",
+ MAME_DIR .. "src/devices/bus/a2gameio/wico_joystick.cpp",
+ MAME_DIR .. "src/devices/bus/a2gameio/wico_joystick.h",
}
end
@@ -3051,8 +3252,6 @@ if (BUSES["NUBUS"]~=null) then
MAME_DIR .. "src/devices/bus/nubus/nubus_asntmc3b.h",
MAME_DIR .. "src/devices/bus/nubus/nubus_image.cpp",
MAME_DIR .. "src/devices/bus/nubus/nubus_image.h",
- MAME_DIR .. "src/devices/bus/nubus/nubus_wsportrait.cpp",
- MAME_DIR .. "src/devices/bus/nubus/nubus_wsportrait.h",
MAME_DIR .. "src/devices/bus/nubus/8lc.cpp",
MAME_DIR .. "src/devices/bus/nubus/8lc.h",
MAME_DIR .. "src/devices/bus/nubus/bootbug.cpp",
@@ -3073,8 +3272,6 @@ if (BUSES["NUBUS"]~=null) then
MAME_DIR .. "src/devices/bus/nubus/pds30_sigmalview.h",
MAME_DIR .. "src/devices/bus/nubus/pds30_30hr.cpp",
MAME_DIR .. "src/devices/bus/nubus/pds30_30hr.h",
- MAME_DIR .. "src/devices/bus/nubus/pds30_mc30.cpp",
- MAME_DIR .. "src/devices/bus/nubus/pds30_mc30.h",
}
end
@@ -3085,6 +3282,8 @@ end
if (BUSES["CENTRONICS"]~=null) then
files {
+ MAME_DIR .. "src/devices/bus/centronics/adaptator.cpp",
+ MAME_DIR .. "src/devices/bus/centronics/adaptator.h",
MAME_DIR .. "src/devices/bus/centronics/ctronics.cpp",
MAME_DIR .. "src/devices/bus/centronics/ctronics.h",
MAME_DIR .. "src/devices/bus/centronics/chessmec.cpp",
@@ -3099,10 +3298,14 @@ if (BUSES["CENTRONICS"]~=null) then
MAME_DIR .. "src/devices/bus/centronics/dsjoy.h",
MAME_DIR .. "src/devices/bus/centronics/epson_ex800.cpp",
MAME_DIR .. "src/devices/bus/centronics/epson_ex800.h",
+ MAME_DIR .. "src/devices/bus/centronics/epson_fx80.cpp",
+ MAME_DIR .. "src/devices/bus/centronics/epson_fx80.h",
MAME_DIR .. "src/devices/bus/centronics/epson_lx800.cpp",
MAME_DIR .. "src/devices/bus/centronics/epson_lx800.h",
MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.cpp",
MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.h",
+ MAME_DIR .. "src/devices/bus/centronics/epson_rx80.cpp",
+ MAME_DIR .. "src/devices/bus/centronics/epson_rx80.h",
MAME_DIR .. "src/devices/bus/centronics/nec_p72.cpp",
MAME_DIR .. "src/devices/bus/centronics/nec_p72.h",
MAME_DIR .. "src/devices/bus/centronics/nlq401.cpp",
@@ -3150,6 +3353,8 @@ if (BUSES["RS232"]~=null) then
MAME_DIR .. "src/devices/bus/rs232/loopback.h",
MAME_DIR .. "src/devices/bus/rs232/mboardd.cpp",
MAME_DIR .. "src/devices/bus/rs232/mboardd.h",
+ MAME_DIR .. "src/devices/bus/rs232/nss_tvinterface.cpp",
+ MAME_DIR .. "src/devices/bus/rs232/nss_tvinterface.h",
MAME_DIR .. "src/devices/bus/rs232/null_modem.cpp",
MAME_DIR .. "src/devices/bus/rs232/null_modem.h",
MAME_DIR .. "src/devices/bus/rs232/patchbox.cpp",
@@ -3162,15 +3367,27 @@ if (BUSES["RS232"]~=null) then
MAME_DIR .. "src/devices/bus/rs232/rs232.h",
MAME_DIR .. "src/devices/bus/rs232/rs232_sync_io.cpp",
MAME_DIR .. "src/devices/bus/rs232/rs232_sync_io.h",
+ MAME_DIR .. "src/devices/bus/rs232/scorpion.cpp",
+ MAME_DIR .. "src/devices/bus/rs232/scorpion.h",
MAME_DIR .. "src/devices/bus/rs232/sun_kbd.cpp",
MAME_DIR .. "src/devices/bus/rs232/sun_kbd.h",
MAME_DIR .. "src/devices/bus/rs232/swtpc8212.cpp",
MAME_DIR .. "src/devices/bus/rs232/swtpc8212.h",
+ MAME_DIR .. "src/devices/bus/rs232/teletex800.cpp",
+ MAME_DIR .. "src/devices/bus/rs232/teletex800.h",
MAME_DIR .. "src/devices/bus/rs232/terminal.cpp",
MAME_DIR .. "src/devices/bus/rs232/terminal.h",
MAME_DIR .. "src/devices/bus/rs232/xvd701.cpp",
MAME_DIR .. "src/devices/bus/rs232/xvd701.h",
}
+
+ dependency {
+ { MAME_DIR .. "src/devices/bus/rs232/teletex800.cpp", GEN_DIR .. "emu/layout/teletex800.lh" },
+ }
+
+ custombuildtask {
+ layoutbuildtask("emu/layout", "teletex800"),
+ }
end
---------------------------------------------------
@@ -3454,6 +3671,8 @@ if (BUSES["SNES"]~=null) then
MAME_DIR .. "src/devices/bus/snes/sgb.h",
MAME_DIR .. "src/devices/bus/snes/spc7110.cpp",
MAME_DIR .. "src/devices/bus/snes/spc7110.h",
+ MAME_DIR .. "src/devices/bus/snes/st018.cpp",
+ MAME_DIR .. "src/devices/bus/snes/st018.h",
MAME_DIR .. "src/devices/bus/snes/sufami.cpp",
MAME_DIR .. "src/devices/bus/snes/sufami.h",
MAME_DIR .. "src/devices/bus/snes/upd.cpp",
@@ -3711,16 +3930,18 @@ end
if (BUSES["SG1000_EXP"]~=null) then
files {
- MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.cpp",
- MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.h",
MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.cpp",
MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.h",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.h",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.h",
MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.cpp",
MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.h",
MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100prn.cpp",
MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100prn.h",
- MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.cpp",
- MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.h",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sp400.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/sp400.h",
}
end
@@ -3901,6 +4122,8 @@ if (BUSES["TI99"]~=null) then
MAME_DIR .. "src/devices/bus/ti99/internal/genkbd.h",
MAME_DIR .. "src/devices/bus/ti99/internal/ioport.cpp",
MAME_DIR .. "src/devices/bus/ti99/internal/ioport.h",
+ MAME_DIR .. "src/devices/bus/ti99/internal/splitter.cpp",
+ MAME_DIR .. "src/devices/bus/ti99/internal/splitter.h",
MAME_DIR .. "src/devices/bus/ti99/colorbus/busmouse.cpp",
MAME_DIR .. "src/devices/bus/ti99/colorbus/busmouse.h",
MAME_DIR .. "src/devices/bus/ti99/colorbus/colorbus.cpp",
@@ -3953,8 +4176,8 @@ if (BUSES["TI99"]~=null) then
MAME_DIR .. "src/devices/bus/ti99/peb/scsicard.h",
MAME_DIR .. "src/devices/bus/ti99/peb/sidmaster.cpp",
MAME_DIR .. "src/devices/bus/ti99/peb/sidmaster.h",
- MAME_DIR .. "src/devices/bus/ti99/peb/spchsyn.cpp",
- MAME_DIR .. "src/devices/bus/ti99/peb/spchsyn.h",
+ MAME_DIR .. "src/devices/bus/ti99/peb/speechadapter.cpp",
+ MAME_DIR .. "src/devices/bus/ti99/peb/speechadapter.h",
MAME_DIR .. "src/devices/bus/ti99/peb/ti_32kmem.cpp",
MAME_DIR .. "src/devices/bus/ti99/peb/ti_32kmem.h",
MAME_DIR .. "src/devices/bus/ti99/peb/ti_fdc.cpp",
@@ -3967,6 +4190,10 @@ if (BUSES["TI99"]~=null) then
MAME_DIR .. "src/devices/bus/ti99/peb/tn_ide.h",
MAME_DIR .. "src/devices/bus/ti99/peb/tn_usbsm.cpp",
MAME_DIR .. "src/devices/bus/ti99/peb/tn_usbsm.h",
+ MAME_DIR .. "src/devices/bus/ti99/sidecar/arcturus.cpp",
+ MAME_DIR .. "src/devices/bus/ti99/sidecar/arcturus.h",
+ MAME_DIR .. "src/devices/bus/ti99/sidecar/speechsyn.cpp",
+ MAME_DIR .. "src/devices/bus/ti99/sidecar/speechsyn.h",
}
end
@@ -4046,14 +4273,14 @@ if (BUSES["BML3"]~=null) then
files {
MAME_DIR .. "src/devices/bus/bml3/bml3bus.cpp",
MAME_DIR .. "src/devices/bus/bml3/bml3bus.h",
- MAME_DIR .. "src/devices/bus/bml3/bml3mp1802.cpp",
- MAME_DIR .. "src/devices/bus/bml3/bml3mp1802.h",
- MAME_DIR .. "src/devices/bus/bml3/bml3mp1805.cpp",
- MAME_DIR .. "src/devices/bus/bml3/bml3mp1805.h",
- MAME_DIR .. "src/devices/bus/bml3/bml3kanji.cpp",
- MAME_DIR .. "src/devices/bus/bml3/bml3kanji.h",
- MAME_DIR .. "src/devices/bus/bml3/bml3rtc.cpp",
- MAME_DIR .. "src/devices/bus/bml3/bml3rtc.h",
+ MAME_DIR .. "src/devices/bus/bml3/mp1802.cpp",
+ MAME_DIR .. "src/devices/bus/bml3/mp1802.h",
+ MAME_DIR .. "src/devices/bus/bml3/mp1805.cpp",
+ MAME_DIR .. "src/devices/bus/bml3/mp1805.h",
+ MAME_DIR .. "src/devices/bus/bml3/kanji.cpp",
+ MAME_DIR .. "src/devices/bus/bml3/kanji.h",
+ MAME_DIR .. "src/devices/bus/bml3/rtc.cpp",
+ MAME_DIR .. "src/devices/bus/bml3/rtc.h",
}
end
@@ -4238,6 +4465,10 @@ if (BUSES["PCE"]~=null) then
MAME_DIR .. "src/devices/bus/pce/pce_slot.h",
MAME_DIR .. "src/devices/bus/pce/pce_rom.cpp",
MAME_DIR .. "src/devices/bus/pce/pce_rom.h",
+ MAME_DIR .. "src/devices/bus/pce/pce_scdsys.cpp",
+ MAME_DIR .. "src/devices/bus/pce/pce_scdsys.h",
+ MAME_DIR .. "src/devices/bus/pce/pce_acard.cpp",
+ MAME_DIR .. "src/devices/bus/pce/pce_acard.h",
}
end
@@ -4475,14 +4706,24 @@ if (BUSES["ZORRO"]~=null) then
MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.h",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.cpp",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/a2091.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/a2091.h",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.cpp",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.h",
- MAME_DIR .. "src/devices/bus/amiga/zorro/a590.cpp",
- MAME_DIR .. "src/devices/bus/amiga/zorro/a590.h",
- MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.cpp",
- MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.h",
MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.cpp",
MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/merlin.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/merlin.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/oktagon2008.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/oktagon2008.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/picasso2.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/picasso2.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/rainbow2.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/rainbow2.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/ripple.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/ripple.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/toccata.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/toccata.h",
}
end
@@ -4545,16 +4786,26 @@ end
if (BUSES["QBUS"]~=null) then
files {
+ MAME_DIR .. "src/devices/bus/qbus/bk_kmd.cpp",
+ MAME_DIR .. "src/devices/bus/qbus/bk_kmd.h",
MAME_DIR .. "src/devices/bus/qbus/dsd4432.cpp",
MAME_DIR .. "src/devices/bus/qbus/dsd4432.h",
MAME_DIR .. "src/devices/bus/qbus/dvk_kgd.cpp",
MAME_DIR .. "src/devices/bus/qbus/dvk_kgd.h",
+ MAME_DIR .. "src/devices/bus/qbus/dvk_mx.cpp",
+ MAME_DIR .. "src/devices/bus/qbus/dvk_mx.h",
MAME_DIR .. "src/devices/bus/qbus/pc11.cpp",
MAME_DIR .. "src/devices/bus/qbus/pc11.h",
MAME_DIR .. "src/devices/bus/qbus/qbus.cpp",
MAME_DIR .. "src/devices/bus/qbus/qbus.h",
+ MAME_DIR .. "src/devices/bus/qbus/qg640.cpp",
+ MAME_DIR .. "src/devices/bus/qbus/qg640.h",
MAME_DIR .. "src/devices/bus/qbus/qtx.cpp",
MAME_DIR .. "src/devices/bus/qbus/qtx.h",
+ MAME_DIR .. "src/devices/bus/qbus/tdl12.cpp",
+ MAME_DIR .. "src/devices/bus/qbus/tdl12.h",
+ MAME_DIR .. "src/devices/bus/qbus/uknc_kmd.cpp",
+ MAME_DIR .. "src/devices/bus/qbus/uknc_kmd.h",
}
end
@@ -4641,6 +4892,8 @@ if (BUSES["SPECTRUM"]~=null) then
MAME_DIR .. "src/devices/bus/spectrum/mikroplus.h",
MAME_DIR .. "src/devices/bus/spectrum/mpoker.cpp",
MAME_DIR .. "src/devices/bus/spectrum/mpoker.h",
+ MAME_DIR .. "src/devices/bus/spectrum/musicmachine.cpp",
+ MAME_DIR .. "src/devices/bus/spectrum/musicmachine.h",
MAME_DIR .. "src/devices/bus/spectrum/opus.cpp",
MAME_DIR .. "src/devices/bus/spectrum/opus.h",
MAME_DIR .. "src/devices/bus/spectrum/plus2test.cpp",
@@ -4663,6 +4916,8 @@ if (BUSES["SPECTRUM"]~=null) then
MAME_DIR .. "src/devices/bus/spectrum/usource.h",
MAME_DIR .. "src/devices/bus/spectrum/uspeech.cpp",
MAME_DIR .. "src/devices/bus/spectrum/uspeech.h",
+ MAME_DIR .. "src/devices/bus/spectrum/vtx5000.cpp",
+ MAME_DIR .. "src/devices/bus/spectrum/vtx5000.h",
MAME_DIR .. "src/devices/bus/spectrum/wafa.cpp",
MAME_DIR .. "src/devices/bus/spectrum/wafa.h",
}
@@ -5035,6 +5290,12 @@ end
if (BUSES["CBUS"]~=null) then
files {
+ MAME_DIR .. "src/devices/bus/cbus/amd98.cpp",
+ MAME_DIR .. "src/devices/bus/cbus/amd98.h",
+ MAME_DIR .. "src/devices/bus/cbus/mif201.cpp",
+ MAME_DIR .. "src/devices/bus/cbus/mif201.h",
+ MAME_DIR .. "src/devices/bus/cbus/mpu_pc98.cpp",
+ MAME_DIR .. "src/devices/bus/cbus/mpu_pc98.h",
MAME_DIR .. "src/devices/bus/cbus/pc9801_26.cpp",
MAME_DIR .. "src/devices/bus/cbus/pc9801_26.h",
MAME_DIR .. "src/devices/bus/cbus/pc9801_55.cpp",
@@ -5043,14 +5304,10 @@ if (BUSES["CBUS"]~=null) then
MAME_DIR .. "src/devices/bus/cbus/pc9801_86.h",
MAME_DIR .. "src/devices/bus/cbus/pc9801_118.cpp",
MAME_DIR .. "src/devices/bus/cbus/pc9801_118.h",
- MAME_DIR .. "src/devices/bus/cbus/pc9801_amd98.cpp",
- MAME_DIR .. "src/devices/bus/cbus/pc9801_amd98.h",
- MAME_DIR .. "src/devices/bus/cbus/pc9801_snd.cpp",
- MAME_DIR .. "src/devices/bus/cbus/pc9801_snd.h",
- MAME_DIR .. "src/devices/bus/cbus/mpu_pc98.cpp",
- MAME_DIR .. "src/devices/bus/cbus/mpu_pc98.h",
MAME_DIR .. "src/devices/bus/cbus/pc9801_cbus.cpp",
MAME_DIR .. "src/devices/bus/cbus/pc9801_cbus.h",
+ MAME_DIR .. "src/devices/bus/cbus/sb16_ct2720.cpp",
+ MAME_DIR .. "src/devices/bus/cbus/sb16_ct2720.h",
}
end
@@ -5187,6 +5444,8 @@ if (BUSES["MULTIBUS"]~=null) then
MAME_DIR .. "src/devices/bus/multibus/labtam_z80sbc.h",
MAME_DIR .. "src/devices/bus/multibus/robotron_k7070.cpp",
MAME_DIR .. "src/devices/bus/multibus/robotron_k7070.h",
+ MAME_DIR .. "src/devices/bus/multibus/robotron_k7071.cpp",
+ MAME_DIR .. "src/devices/bus/multibus/robotron_k7071.h",
}
end
@@ -5320,11 +5579,13 @@ end
---------------------------------------------------
--
---@src/devices/bus/pc8801/pc8801_31.h,BUSES["PC8801"] = true
+--@src/devices/bus/pc8801/pc8801_exp.h,BUSES["PC8801"] = true
---------------------------------------------------
if (BUSES["PC8801"]~=null) then
files {
+ MAME_DIR .. "src/devices/bus/pc8801/gsx8800.cpp",
+ MAME_DIR .. "src/devices/bus/pc8801/gsx8800.h",
MAME_DIR .. "src/devices/bus/pc8801/pc8801_23.cpp",
MAME_DIR .. "src/devices/bus/pc8801/pc8801_23.h",
MAME_DIR .. "src/devices/bus/pc8801/pc8801_31.cpp",
@@ -5342,6 +5603,33 @@ end
---------------------------------------------------
--
+--@src/devices/bus/jvs/jvs.h,BUSES["JVS"] = true
+---------------------------------------------------
+
+if (BUSES["JVS"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/jvs/cyberlead.cpp",
+ MAME_DIR .. "src/devices/bus/jvs/cyberlead.h",
+ MAME_DIR .. "src/devices/bus/jvs/jvs.cpp",
+ MAME_DIR .. "src/devices/bus/jvs/jvs.h",
+ MAME_DIR .. "src/devices/bus/jvs/jvshle.cpp",
+ MAME_DIR .. "src/devices/bus/jvs/jvshle.h",
+ MAME_DIR .. "src/devices/bus/jvs/namcoio.cpp",
+ MAME_DIR .. "src/devices/bus/jvs/namcoio.h",
+ }
+
+ dependency {
+ { MAME_DIR .. "src/devices/bus/jvs/cyberlead.cpp", GEN_DIR .. "emu/layout/cyberlead.lh" },
+ }
+
+ custombuildtask {
+ layoutbuildtask("emu/layout", "cyberlead"),
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/mtu130/board.h,BUSES["MTU130"] = true
---------------------------------------------------
@@ -5420,33 +5708,168 @@ if (BUSES["PCI"]~=null) then
files {
MAME_DIR .. "src/devices/bus/pci/pci_slot.cpp",
MAME_DIR .. "src/devices/bus/pci/pci_slot.h",
- MAME_DIR .. "src/devices/bus/pci/virge_pci.cpp",
- MAME_DIR .. "src/devices/bus/pci/virge_pci.h",
- MAME_DIR .. "src/devices/bus/pci/riva128.cpp",
- MAME_DIR .. "src/devices/bus/pci/riva128.h",
- MAME_DIR .. "src/devices/bus/pci/rivatnt.cpp",
- MAME_DIR .. "src/devices/bus/pci/rivatnt.h",
+ MAME_DIR .. "src/devices/bus/pci/aha2940au.cpp",
+ MAME_DIR .. "src/devices/bus/pci/aha2940au.h",
+ MAME_DIR .. "src/devices/bus/pci/audiowerk2.cpp",
+ MAME_DIR .. "src/devices/bus/pci/audiowerk2.h",
+ MAME_DIR .. "src/devices/bus/pci/clgd5446.cpp",
+ MAME_DIR .. "src/devices/bus/pci/clgd5446.h",
+ MAME_DIR .. "src/devices/bus/pci/clgd546x_laguna.cpp",
+ MAME_DIR .. "src/devices/bus/pci/clgd546x_laguna.h",
+ MAME_DIR .. "src/devices/bus/pci/ds2416.cpp",
+ MAME_DIR .. "src/devices/bus/pci/ds2416.h",
+ MAME_DIR .. "src/devices/bus/pci/ess_maestro.cpp",
+ MAME_DIR .. "src/devices/bus/pci/ess_maestro.h",
MAME_DIR .. "src/devices/bus/pci/geforce.cpp",
MAME_DIR .. "src/devices/bus/pci/geforce.h",
MAME_DIR .. "src/devices/bus/pci/mga2064w.cpp",
MAME_DIR .. "src/devices/bus/pci/mga2064w.h",
+ MAME_DIR .. "src/devices/bus/pci/ncr53c825.cpp",
+ MAME_DIR .. "src/devices/bus/pci/ncr53c825.h",
+ MAME_DIR .. "src/devices/bus/pci/neon250.cpp",
+ MAME_DIR .. "src/devices/bus/pci/neon250.h",
+ MAME_DIR .. "src/devices/bus/pci/oti_spitfire.cpp",
+ MAME_DIR .. "src/devices/bus/pci/oti_spitfire.h",
+ MAME_DIR .. "src/devices/bus/pci/opti82c861.cpp",
+ MAME_DIR .. "src/devices/bus/pci/opti82c861.h",
+ MAME_DIR .. "src/devices/bus/pci/pdc20262.cpp",
+ MAME_DIR .. "src/devices/bus/pci/pdc20262.h",
MAME_DIR .. "src/devices/bus/pci/promotion.cpp",
MAME_DIR .. "src/devices/bus/pci/promotion.h",
- MAME_DIR .. "src/devices/bus/pci/ymp21.cpp",
- MAME_DIR .. "src/devices/bus/pci/ymp21.h",
- MAME_DIR .. "src/devices/bus/pci/sw1000xg.cpp",
- MAME_DIR .. "src/devices/bus/pci/sw1000xg.h",
- MAME_DIR .. "src/devices/bus/pci/ds2416.cpp",
- MAME_DIR .. "src/devices/bus/pci/ds2416.h",
- MAME_DIR .. "src/devices/bus/pci/sonicvibes.cpp",
- MAME_DIR .. "src/devices/bus/pci/sonicvibes.h",
- MAME_DIR .. "src/devices/bus/pci/zr36057.cpp",
- MAME_DIR .. "src/devices/bus/pci/zr36057.h",
+ MAME_DIR .. "src/devices/bus/pci/riva128.cpp",
+ MAME_DIR .. "src/devices/bus/pci/riva128.h",
+ MAME_DIR .. "src/devices/bus/pci/rivatnt.cpp",
+ MAME_DIR .. "src/devices/bus/pci/rivatnt.h",
MAME_DIR .. "src/devices/bus/pci/rtl8029as_pci.cpp",
MAME_DIR .. "src/devices/bus/pci/rtl8029as_pci.h",
MAME_DIR .. "src/devices/bus/pci/rtl8139_pci.cpp",
MAME_DIR .. "src/devices/bus/pci/rtl8139_pci.h",
- MAME_DIR .. "src/devices/bus/pci/opti82c861.cpp",
- MAME_DIR .. "src/devices/bus/pci/opti82c861.h",
+ MAME_DIR .. "src/devices/bus/pci/sis6326.cpp",
+ MAME_DIR .. "src/devices/bus/pci/sis6326.h",
+ MAME_DIR .. "src/devices/bus/pci/sonicvibes.cpp",
+ MAME_DIR .. "src/devices/bus/pci/sonicvibes.h",
+ MAME_DIR .. "src/devices/bus/pci/sw1000xg.cpp",
+ MAME_DIR .. "src/devices/bus/pci/sw1000xg.h",
+ MAME_DIR .. "src/devices/bus/pci/virge_pci.cpp",
+ MAME_DIR .. "src/devices/bus/pci/virge_pci.h",
+ MAME_DIR .. "src/devices/bus/pci/vision.cpp",
+ MAME_DIR .. "src/devices/bus/pci/vision.h",
+ MAME_DIR .. "src/devices/bus/pci/vt6306.cpp",
+ MAME_DIR .. "src/devices/bus/pci/vt6306.h",
+ MAME_DIR .. "src/devices/bus/pci/wd9710_pci.cpp",
+ MAME_DIR .. "src/devices/bus/pci/wd9710_pci.h",
+ MAME_DIR .. "src/devices/bus/pci/ymp21.cpp",
+ MAME_DIR .. "src/devices/bus/pci/ymp21.h",
+ MAME_DIR .. "src/devices/bus/pci/zr36057.cpp",
+ MAME_DIR .. "src/devices/bus/pci/zr36057.h",
+ }
+end
+
+
+---------------------------------------------------
+--
+--@src/devices/bus/plg1x0/plg1x0.h,BUSES["PLG1X0"] = true
+---------------------------------------------------
+
+if (BUSES["PLG1X0"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/plg1x0/plg1x0.cpp",
+ MAME_DIR .. "src/devices/bus/plg1x0/plg1x0.h",
+ MAME_DIR .. "src/devices/bus/plg1x0/plg100-vl.cpp",
+ MAME_DIR .. "src/devices/bus/plg1x0/plg100-vl.h",
+ MAME_DIR .. "src/devices/bus/plg1x0/plg150-ap.cpp",
+ MAME_DIR .. "src/devices/bus/plg1x0/plg150-ap.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/heathzenith/h89/h89bus.h,BUSES["H89BUS"] = true
+---------------------------------------------------
+
+if (BUSES["H89BUS"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/cdr_fdc_880h.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/cdr_fdc_880h.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h89bus.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h89bus.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h17_fdc.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h17_fdc.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h_88_3.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h_88_3.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h_88_5.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/h_88_5.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/mms77316_fdc.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/mms77316_fdc.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_sound.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_sound.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_parallel_port.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/sigmasoft_parallel_port.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/we_pullup.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/we_pullup.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/z_89_11.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/z_89_11.h",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/z37_fdc.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h89/z37_fdc.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/heathzenith/intr_cntrl/intr_cntrl.h,BUSES["HEATH_INTR_SOCKET"] = true
+---------------------------------------------------
+
+if (BUSES["HEATH_INTR_SOCKET"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/heathzenith/intr_cntrl/intr_cntrl.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/intr_cntrl/intr_cntrl.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/heathzenith/h19/tlb.h,BUSES["HEATH_TLB_CONNECTOR"] = true
+---------------------------------------------------
+
+if (BUSES["HEATH_TLB_CONNECTOR"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/heathzenith/h19/tlb.cpp",
+ MAME_DIR .. "src/devices/bus/heathzenith/h19/tlb.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/amiga/cpuslot/cpuslot.h,BUSES["AMIGA_CPUSLOT"] = true
+---------------------------------------------------
+
+if (BUSES["AMIGA_CPUSLOT"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/cpuslot.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/cpuslot.h",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/cards.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/cards.h",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/a570.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/a570.h",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/a590.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/a590.h",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/action_replay.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/action_replay.h",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/megamix500.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/cpuslot/megamix500.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/st/stcart.h,BUSES["STCART_CONNECTOR"] = true
+---------------------------------------------------
+
+if (BUSES["STCART_CONNECTOR"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/st/stcart.cpp",
+ MAME_DIR .. "src/devices/bus/st/stcart.h",
+ MAME_DIR .. "src/devices/bus/st/replay.cpp",
+ MAME_DIR .. "src/devices/bus/st/replay.h",
}
end
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 1afc05b20ee..cb130e07527 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -21,9 +21,10 @@ for i, v in ipairs(DRC_CPUS) do
break
end
end
+CPU_INCLUDE_DRC_NATIVE = CPU_INCLUDE_DRC and (not _OPTIONS["FORCE_DRC_C_BACKEND"]) and ((_OPTIONS["PLATFORM"] == "x86") or (_OPTIONS["PLATFORM"] == "arm64"))
-if (CPU_INCLUDE_DRC) then
+if CPU_INCLUDE_DRC then
files {
MAME_DIR .. "src/devices/cpu/drcbec.cpp",
MAME_DIR .. "src/devices/cpu/drcbec.h",
@@ -41,22 +42,16 @@ if (CPU_INCLUDE_DRC) then
MAME_DIR .. "src/devices/cpu/x86log.h",
MAME_DIR .. "src/devices/cpu/drcumlsh.h",
}
- if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
- files {
- MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
- MAME_DIR .. "src/devices/cpu/drcbex64.h",
- MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
- MAME_DIR .. "src/devices/cpu/drcbex86.h",
- }
- end
-
- if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then
- if string.find(_OPTIONS["gcc"], "clang") and (str_to_version(_OPTIONS["gcc_version"]) < 80000) then
- defines {
- "TARGET_OS_OSX=1",
- }
- end
- end
+end
+if CPU_INCLUDE_DRC_NATIVE then
+ files {
+ MAME_DIR .. "src/devices/cpu/drcbearm64.cpp",
+ MAME_DIR .. "src/devices/cpu/drcbearm64.h",
+ MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
+ MAME_DIR .. "src/devices/cpu/drcbex64.h",
+ MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
+ MAME_DIR .. "src/devices/cpu/drcbex86.h",
+ }
end
--------------------------------------------------
@@ -651,14 +646,14 @@ if CPUS["G65816"] then
files {
MAME_DIR .. "src/devices/cpu/g65816/g65816.cpp",
MAME_DIR .. "src/devices/cpu/g65816/g65816.h",
+ MAME_DIR .. "src/devices/cpu/g65816/g65816cm.h",
+ MAME_DIR .. "src/devices/cpu/g65816/g65816ds.h",
MAME_DIR .. "src/devices/cpu/g65816/g65816o0.cpp",
MAME_DIR .. "src/devices/cpu/g65816/g65816o1.cpp",
MAME_DIR .. "src/devices/cpu/g65816/g65816o2.cpp",
MAME_DIR .. "src/devices/cpu/g65816/g65816o3.cpp",
MAME_DIR .. "src/devices/cpu/g65816/g65816o4.cpp",
- MAME_DIR .. "src/devices/cpu/g65816/g65816cm.h",
- MAME_DIR .. "src/devices/cpu/g65816/g65816ds.h",
- MAME_DIR .. "src/devices/cpu/g65816/g65816op.h",
+ MAME_DIR .. "src/devices/cpu/g65816/g65816op.ipp",
}
end
@@ -691,6 +686,8 @@ end
if CPUS["H8"] then
files {
+ MAME_DIR .. "src/devices/cpu/h8/c77.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/c77.h",
MAME_DIR .. "src/devices/cpu/h8/h8.cpp",
MAME_DIR .. "src/devices/cpu/h8/h8.h",
MAME_DIR .. "src/devices/cpu/h8/h8h.cpp",
@@ -699,8 +696,8 @@ if CPUS["H8"] then
MAME_DIR .. "src/devices/cpu/h8/h8s2000.h",
MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp",
MAME_DIR .. "src/devices/cpu/h8/h8s2600.h",
- MAME_DIR .. "src/devices/cpu/h8/h83337.cpp",
- MAME_DIR .. "src/devices/cpu/h8/h83337.h",
+ MAME_DIR .. "src/devices/cpu/h8/h8325.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/h8325.h",
MAME_DIR .. "src/devices/cpu/h8/h83002.cpp",
MAME_DIR .. "src/devices/cpu/h8/h83002.h",
MAME_DIR .. "src/devices/cpu/h8/h83003.cpp",
@@ -715,10 +712,16 @@ if CPUS["H8"] then
MAME_DIR .. "src/devices/cpu/h8/h83042.h",
MAME_DIR .. "src/devices/cpu/h8/h83048.cpp",
MAME_DIR .. "src/devices/cpu/h8/h83048.h",
+ MAME_DIR .. "src/devices/cpu/h8/h83217.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/h83217.h",
+ MAME_DIR .. "src/devices/cpu/h8/h83337.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/h83337.h",
MAME_DIR .. "src/devices/cpu/h8/h8s2245.cpp",
MAME_DIR .. "src/devices/cpu/h8/h8s2245.h",
- MAME_DIR .. "src/devices/cpu/h8/h8s2320.cpp",
- MAME_DIR .. "src/devices/cpu/h8/h8s2320.h",
+ MAME_DIR .. "src/devices/cpu/h8/h8s2319.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/h8s2319.h",
+ MAME_DIR .. "src/devices/cpu/h8/h8s2329.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/h8s2329.h",
MAME_DIR .. "src/devices/cpu/h8/h8s2357.cpp",
MAME_DIR .. "src/devices/cpu/h8/h8s2357.h",
MAME_DIR .. "src/devices/cpu/h8/h8s2655.cpp",
@@ -743,6 +746,8 @@ if CPUS["H8"] then
MAME_DIR .. "src/devices/cpu/h8/h8_watchdog.h",
MAME_DIR .. "src/devices/cpu/h8/gt913.cpp",
MAME_DIR .. "src/devices/cpu/h8/gt913.h",
+ MAME_DIR .. "src/devices/cpu/h8/swx00.cpp",
+ MAME_DIR .. "src/devices/cpu/h8/swx00.h",
}
dependency {
@@ -848,6 +853,24 @@ if opt_tool(CPUS, "HMCS40") then
end
--------------------------------------------------
+-- Hitachi HMCS400 series
+--@src/devices/cpu/hmcs400/hmcs400.h,CPUS["HMCS400"] = true
+--------------------------------------------------
+
+if CPUS["HMCS400"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/hmcs400/hmcs400.cpp",
+ MAME_DIR .. "src/devices/cpu/hmcs400/hmcs400.h",
+ MAME_DIR .. "src/devices/cpu/hmcs400/hmcs400op.cpp",
+ }
+end
+
+if opt_tool(CPUS, "HMCS400") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hmcs400/hmcs400d.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hmcs400/hmcs400d.h")
+end
+
+--------------------------------------------------
-- Hitachi SuperH series (SH1/SH2/SH3/SH4)
--@src/devices/cpu/sh/sh2.h,CPUS["SH"] = true
--@src/devices/cpu/sh/sh4.h,CPUS["SH"] = true
@@ -893,6 +916,22 @@ if CPUS["SH"] then
MAME_DIR .. "src/devices/cpu/sh/sh7032.h",
MAME_DIR .. "src/devices/cpu/sh/sh7042.cpp",
MAME_DIR .. "src/devices/cpu/sh/sh7042.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_adc.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_adc.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_bsc.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_bsc.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_cmt.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_cmt.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_dmac.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_dmac.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_intc.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_intc.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_mtu.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_mtu.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_port.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_port.h",
+ MAME_DIR .. "src/devices/cpu/sh/sh_sci.cpp",
+ MAME_DIR .. "src/devices/cpu/sh/sh_sci.h",
MAME_DIR .. "src/devices/cpu/sh/sh7604_bus.cpp",
MAME_DIR .. "src/devices/cpu/sh/sh7604_bus.h",
MAME_DIR .. "src/devices/cpu/sh/sh7604_sci.cpp",
@@ -1176,6 +1215,26 @@ if opt_tool(CPUS, "AXC51") then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/acx51/axc51dasm.h")
end
+
+--------------------------------------------------
+-- Philips XA (80c51 inspired)
+--@src/devices/cpu/xa/xa.h,CPUS["XA"] = true
+--------------------------------------------------
+
+if CPUS["XA"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/xa/xa.cpp",
+ MAME_DIR .. "src/devices/cpu/xa/xa_ops.cpp",
+ MAME_DIR .. "src/devices/cpu/xa/xa.h",
+ }
+end
+
+if opt_tool(CPUS, "XA") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/xa/xadasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/xa/xadasm.h")
+end
+
+
--------------------------------------------------
-- Intel MCS-96
--@src/devices/cpu/mcs96/mcs96.h,CPUS["MCS96"] = true
@@ -1237,7 +1296,7 @@ end
-- Beware that opt_tool can set the value, so we want both to be executed always
local want_disasm_i86 = opt_tool(CPUS, "I86")
local want_disasm_i386 = opt_tool(CPUS, "I386")
-if want_disasm_i86 or want_disasm_i386 or CPU_INCLUDE_DRC then
+if want_disasm_i86 or want_disasm_i386 or CPU_INCLUDE_DRC_NATIVE then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.h")
end
@@ -1352,6 +1411,25 @@ if opt_tool(CPUS, "DIABLO") then
end
--------------------------------------------------
+-- KL1839VM1
+--@src/devices/cpu/mpk1839/kl1839vm1.h,CPUS["KL1839VM1"] = true
+--------------------------------------------------
+
+if CPUS["KL1839VM1"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/mpk1839/kl1839vm1.cpp",
+ MAME_DIR .. "src/devices/cpu/mpk1839/kl1839vm1.h",
+ MAME_DIR .. "src/devices/cpu/vax/vaxdasm.cpp",
+ MAME_DIR .. "src/devices/cpu/vax/vaxdasm.h",
+ }
+end
+
+if opt_tool(CPUS, "KL1839VM1") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mpk1839/kl1839vm1dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mpk1839/kl1839vm1dasm.h")
+end
+
+--------------------------------------------------
-- Fujitsu MB88xx
--@src/devices/cpu/mb88xx/mb88xx.h,CPUS["MB88XX"] = true
--------------------------------------------------
@@ -1451,6 +1529,23 @@ if opt_tool(CPUS, "PIC16C62X") then
end
--------------------------------------------------
+-- Microchip PIC16x8x
+--@src/devices/cpu/pic16x8x/pic16x8x.h,CPUS["PIC16X8X"] = true
+--------------------------------------------------
+
+if CPUS["PIC16X8X"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/pic16x8x/pic16x8x.cpp",
+ MAME_DIR .. "src/devices/cpu/pic16x8x/pic16x8x.h",
+ }
+end
+
+if opt_tool(CPUS, "PIC16X8X") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pic16x8x/16x8xdsm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pic16x8x/16x8xdsm.h")
+end
+
+--------------------------------------------------
-- Generic PIC16 - Disassembler only
--@src/devices/cpu/pic16/pic16.h,CPUS["PIC16"] = true
--------------------------------------------------
@@ -1559,6 +1654,23 @@ if opt_tool(CPUS, "PSX") then
end
--------------------------------------------------
+-- MIPS-X
+--@src/devices/cpu/mipsx/mipsx.h,CPUS["MIPSX"] = true
+--------------------------------------------------
+
+if CPUS["MIPSX"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/mipsx/mipsx.cpp",
+ MAME_DIR .. "src/devices/cpu/mipsx/mipsx.h",
+ }
+end
+
+if opt_tool(CPUS, "MIPSX") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mipsx/mipsxdasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mipsx/mipsxdasm.h")
+end
+
+--------------------------------------------------
-- Mitsubishi MELPS 4 series
--@src/devices/cpu/melps4/melps4.h,CPUS["MELPS4"] = true
--------------------------------------------------
@@ -1623,9 +1735,11 @@ end
--------------------------------------------------
-- MOS Technology 6502 and its many derivatives
--@src/devices/cpu/m6502/deco16.h,CPUS["M6502"] = true
+--@src/devices/cpu/m6502/g65sc02.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/gew7.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/gew12.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m3745x.h,CPUS["M6502"] = true
+--@src/devices/cpu/m6502/m37640.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m4510.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m50734.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m5074x.h,CPUS["M6502"] = true
@@ -1638,8 +1752,6 @@ end
--@src/devices/cpu/m6502/m6510.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m6510t.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m65ce02.h,CPUS["M6502"] = true
---@src/devices/cpu/m6502/m65c02.h,CPUS["M6502"] = true
---@src/devices/cpu/m6502/m65sc02.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m740.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m7501.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/m8502.h,CPUS["M6502"] = true
@@ -1649,6 +1761,7 @@ end
--@src/devices/cpu/m6502/st2xxx.h,CPUS["ST2XXX"] = true
--@src/devices/cpu/m6502/st2204.h,CPUS["ST2XXX"] = true
--@src/devices/cpu/m6502/st2205u.h,CPUS["ST2XXX"] = true
+--@src/devices/cpu/m6502/w65c02.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/w65c02s.h,CPUS["M6502"] = true
--@src/devices/cpu/m6502/xavix.h,CPUS["XAVIX"] = true
--@src/devices/cpu/m6502/xavix.h,CPUS["XAVIX2000"] = true
@@ -1659,12 +1772,16 @@ if CPUS["M6502"] then
files {
MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp",
MAME_DIR .. "src/devices/cpu/m6502/deco16.h",
+ MAME_DIR .. "src/devices/cpu/m6502/g65sc02.cpp",
+ MAME_DIR .. "src/devices/cpu/m6502/g65sc02.h",
MAME_DIR .. "src/devices/cpu/m6502/gew7.cpp",
MAME_DIR .. "src/devices/cpu/m6502/gew7.h",
MAME_DIR .. "src/devices/cpu/m6502/gew12.cpp",
MAME_DIR .. "src/devices/cpu/m6502/gew12.h",
MAME_DIR .. "src/devices/cpu/m6502/m3745x.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m3745x.h",
+ MAME_DIR .. "src/devices/cpu/m6502/m37640.cpp",
+ MAME_DIR .. "src/devices/cpu/m6502/m37640.h",
MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m4510.h",
MAME_DIR .. "src/devices/cpu/m6502/m50734.cpp",
@@ -1689,12 +1806,8 @@ if CPUS["M6502"] then
MAME_DIR .. "src/devices/cpu/m6502/m6510.h",
MAME_DIR .. "src/devices/cpu/m6502/m6510t.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m6510t.h",
- MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp",
- MAME_DIR .. "src/devices/cpu/m6502/m65c02.h",
MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m65ce02.h",
- MAME_DIR .. "src/devices/cpu/m6502/m65sc02.cpp",
- MAME_DIR .. "src/devices/cpu/m6502/m65sc02.h",
MAME_DIR .. "src/devices/cpu/m6502/m740.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m740.h",
MAME_DIR .. "src/devices/cpu/m6502/m7501.cpp",
@@ -1707,6 +1820,8 @@ if CPUS["M6502"] then
MAME_DIR .. "src/devices/cpu/m6502/r65c19.h",
MAME_DIR .. "src/devices/cpu/m6502/rp2a03.cpp",
MAME_DIR .. "src/devices/cpu/m6502/rp2a03.h",
+ MAME_DIR .. "src/devices/cpu/m6502/w65c02.cpp",
+ MAME_DIR .. "src/devices/cpu/m6502/w65c02.h",
MAME_DIR .. "src/devices/cpu/m6502/w65c02s.cpp",
MAME_DIR .. "src/devices/cpu/m6502/w65c02s.h",
}
@@ -1715,7 +1830,6 @@ if CPUS["M6502"] then
{ MAME_DIR .. "src/devices/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 instruction source file...", PYTHON .. " $(1) s deco16 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 instruction source file...", PYTHON .. " $(1) s m4510 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 instruction source file...", PYTHON .. " $(1) s m6502 $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 instruction source file...", PYTHON .. " $(1) s m65c02 $(<) $(2) $(@)" }},
{ 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 instruction 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 instruction 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 instruction source file...", PYTHON .. " $(1) s m6510 $(<) $(2) $(@)" }},
@@ -1723,6 +1837,7 @@ if CPUS["M6502"] then
{ 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 instruction 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 instruction source file...", PYTHON .. " $(1) s r65c19 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/orp2a03.lst", GEN_DIR .. "emu/cpu/m6502/rp2a03.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/drp2a03.lst" }, {"@echo Generating rp2a03 instruction source file...", PYTHON .. " $(1) s rp2a03_core $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/ow65c02.lst", GEN_DIR .. "emu/cpu/m6502/w65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dw65c02.lst" }, {"@echo Generating w65c02 instruction source file...", PYTHON .. " $(1) s w65c02 $(<) $(2) $(@)" }},
{ MAME_DIR .. "src/devices/cpu/m6502/ow65c02s.lst", GEN_DIR .. "emu/cpu/m6502/w65c02s.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dw65c02s.lst" }, {"@echo Generating w65c02s instruction source file...", PYTHON .. " $(1) s w65c02s $(<) $(2) $(@)" }},
}
@@ -1732,12 +1847,12 @@ if CPUS["M6502"] then
{ MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp", GEN_DIR .. "emu/cpu/m6502/m6502.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp", GEN_DIR .. "emu/cpu/m6502/m6509.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp", GEN_DIR .. "emu/cpu/m6502/m6510.hxx" },
- { MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp", GEN_DIR .. "emu/cpu/m6502/m65c02.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp", GEN_DIR .. "emu/cpu/m6502/m65ce02.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/m740.cpp", GEN_DIR .. "emu/cpu/m6502/m740.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/r65c19.cpp", GEN_DIR .. "emu/cpu/m6502/r65c19.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/rp2a03.cpp", GEN_DIR .. "emu/cpu/m6502/rp2a03.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/w65c02.cpp", GEN_DIR .. "emu/cpu/m6502/w65c02.hxx" },
{ MAME_DIR .. "src/devices/cpu/m6502/w65c02s.cpp", GEN_DIR .. "emu/cpu/m6502/w65c02s.hxx" },
}
end
@@ -1787,7 +1902,6 @@ if opt_tool(CPUS, "M6502") then
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 disassembler source file...", PYTHON .. " $(1) d deco16 $(<) $(2) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 disassembler source file...", PYTHON .. " $(1) d m4510 $(<) $(2) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 disassembler source file...", PYTHON .. " $(1) d m6502 $(<) $(2) $(@)" }})
- table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 disassembler source file...", PYTHON .. " $(1) d m65c02 $(<) $(2) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om65ce02.lst", GEN_DIR .. "emu/cpu/m6502/m65ce02d.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) d m65ce02 $(<) $(2) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509d.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) d m6509 $(<) $(2) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510d.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) d m6510 $(<) $(2) $(@)" }})
@@ -1795,18 +1909,19 @@ if opt_tool(CPUS, "M6502") then
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", }, {"@echo Generating r65c02 disassembler source file...", PYTHON .. " $(1) d r65c02 - $(<) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/or65c19.lst", GEN_DIR .. "emu/cpu/m6502/r65c19d.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) d r65c19 $(<) $(2) $(@)" }})
table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/orp2a03.lst", GEN_DIR .. "emu/cpu/m6502/rp2a03d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/drp2a03.lst" }, {"@echo Generating rp2a03 disassembler source file...", PYTHON .. " $(1) d rp2a03 $(<) $(2) $(@)" }})
+ table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/ow65c02.lst", GEN_DIR .. "emu/cpu/m6502/w65c02d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dw65c02.lst" }, {"@echo Generating w65c02 disassembler source file...", PYTHON .. " $(1) d w65c02 $(<) $(2) $(@)" }})
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/deco16d.cpp", GEN_DIR .. "emu/cpu/m6502/deco16d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m4510d.cpp", GEN_DIR .. "emu/cpu/m6502/m4510d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m6502d.cpp", GEN_DIR .. "emu/cpu/m6502/m6502d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m6509d.cpp", GEN_DIR .. "emu/cpu/m6502/m6509d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m6510d.cpp", GEN_DIR .. "emu/cpu/m6502/m6510d.hxx" })
- table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m65c02d.cpp", GEN_DIR .. "emu/cpu/m6502/m65c02d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m65ce02d.cpp", GEN_DIR .. "emu/cpu/m6502/m65ce02d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m740d.cpp", GEN_DIR .. "emu/cpu/m6502/m740d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/r65c02d.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/r65c19d.cpp", GEN_DIR .. "emu/cpu/m6502/r65c19d.hxx" })
table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/rp2a03d.cpp", GEN_DIR .. "emu/cpu/m6502/rp2a03d.hxx" })
+ table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/w65c02d.cpp", GEN_DIR .. "emu/cpu/m6502/w65c02d.hxx" })
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/deco16d.cpp")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/deco16d.h")
@@ -1818,8 +1933,6 @@ if opt_tool(CPUS, "M6502") then
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m6509d.h")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m6510d.cpp")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m6510d.h")
- table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m65c02d.cpp")
- table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m65c02d.h")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m65ce02d.cpp")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m65ce02d.h")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/m740d.cpp")
@@ -1830,6 +1943,8 @@ if opt_tool(CPUS, "M6502") then
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/r65c19d.h")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/rp2a03d.cpp")
table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/rp2a03d.h")
+ table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/w65c02d.cpp")
+ table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/w65c02d.h")
end
if opt_tool(CPUS, "XAVIX") then
@@ -1882,10 +1997,16 @@ if CPUS["M6805"] then
MAME_DIR .. "src/devices/cpu/m6805/m6805.h",
MAME_DIR .. "src/devices/cpu/m6805/m6805defs.h",
MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx",
+ MAME_DIR .. "src/devices/cpu/m6805/hd6305.cpp",
+ MAME_DIR .. "src/devices/cpu/m6805/hd6305.h",
MAME_DIR .. "src/devices/cpu/m6805/m68705.cpp",
MAME_DIR .. "src/devices/cpu/m6805/m68705.h",
MAME_DIR .. "src/devices/cpu/m6805/m68hc05.cpp",
MAME_DIR .. "src/devices/cpu/m6805/m68hc05.h",
+ MAME_DIR .. "src/devices/cpu/m6805/m68hc05e1.cpp",
+ MAME_DIR .. "src/devices/cpu/m6805/m68hc05e1.h",
+ MAME_DIR .. "src/devices/cpu/m6805/m68hc05pge.cpp",
+ MAME_DIR .. "src/devices/cpu/m6805/m68hc05pge.h",
}
end
@@ -1998,6 +2119,8 @@ if CPUS["M680X0"] then
MAME_DIR .. "src/devices/cpu/m68000/m68008-sip8.cpp",
MAME_DIR .. "src/devices/cpu/m68000/m68008.h",
MAME_DIR .. "src/devices/cpu/m68000/m68008.cpp",
+ MAME_DIR .. "src/devices/cpu/m68000/m68000musashi.h",
+ MAME_DIR .. "src/devices/cpu/m68000/m68000musashi.cpp",
MAME_DIR .. "src/devices/cpu/m68000/m68010.h",
MAME_DIR .. "src/devices/cpu/m68000/m68010.cpp",
MAME_DIR .. "src/devices/cpu/m68000/m68020.h",
@@ -2240,8 +2363,6 @@ if CPUS["UPD7810"] then
MAME_DIR .. "src/devices/cpu/upd7810/upd7810_opcodes.cpp",
MAME_DIR .. "src/devices/cpu/upd7810/upd7810_table.cpp",
MAME_DIR .. "src/devices/cpu/upd7810/upd7810_macros.h",
- MAME_DIR .. "src/devices/cpu/upd7810/upd7811.cpp",
- MAME_DIR .. "src/devices/cpu/upd7810/upd7811.h",
}
end
@@ -2455,7 +2576,6 @@ if CPUS["S2650"] then
files {
MAME_DIR .. "src/devices/cpu/s2650/s2650.cpp",
MAME_DIR .. "src/devices/cpu/s2650/s2650.h",
- MAME_DIR .. "src/devices/cpu/s2650/s2650cpu.h",
}
end
@@ -2855,6 +2975,8 @@ if CPUS["TLCS900"] then
MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.h",
MAME_DIR .. "src/devices/cpu/tlcs900/900tbl.hxx",
MAME_DIR .. "src/devices/cpu/tlcs900/900htbl.hxx",
+ MAME_DIR .. "src/devices/cpu/tlcs900/tmp94c241.cpp",
+ MAME_DIR .. "src/devices/cpu/tlcs900/tmp94c241.h",
MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c061.cpp",
MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c061.h",
MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c063.cpp",
@@ -2889,16 +3011,28 @@ end
--------------------------------------------------
-- Zilog Z80
--@src/devices/cpu/z80/z80.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/tmpz84c011.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/tmpz84c015.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/ez80.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/lz8420m.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/mc8123.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/nsc800.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/r800.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/z84c015.h,CPUS["Z80"] = true
+--@src/devices/cpu/z80/z80n.h,CPUS["Z80N"] = true
--@src/devices/cpu/z80/kc82.h,CPUS["KC80"] = true
--@src/devices/cpu/z80/kl5c80a12.h,CPUS["KC80"] = true
--@src/devices/cpu/z80/kl5c80a16.h,CPUS["KC80"] = true
--@src/devices/cpu/z80/ky80.h,CPUS["KC80"] = true
+--@src/devices/cpu/z80/t6a84.h,CPUS["T6A84"] = true
--------------------------------------------------
-if (CPUS["Z80"]~=null or CPUS["KC80"]~=null) then
+if CPUS["Z80"] or CPUS["KC80"] or CPUS["Z80N"] or CPUS["T6A84"] then
files {
MAME_DIR .. "src/devices/cpu/z80/z80.cpp",
MAME_DIR .. "src/devices/cpu/z80/z80.h",
+ MAME_DIR .. "src/devices/cpu/z80/t6a84.cpp",
+ MAME_DIR .. "src/devices/cpu/z80/t6a84.h",
MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.cpp",
MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.h",
MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.cpp",
@@ -2909,11 +3043,42 @@ if (CPUS["Z80"]~=null or CPUS["KC80"]~=null) then
MAME_DIR .. "src/devices/cpu/z80/lz8420m.h",
MAME_DIR .. "src/devices/cpu/z80/mc8123.cpp",
MAME_DIR .. "src/devices/cpu/z80/mc8123.h",
+ MAME_DIR .. "src/devices/cpu/z80/nsc800.cpp",
+ MAME_DIR .. "src/devices/cpu/z80/nsc800.h",
MAME_DIR .. "src/devices/cpu/z80/r800.cpp",
MAME_DIR .. "src/devices/cpu/z80/r800.h",
MAME_DIR .. "src/devices/cpu/z80/z84c015.cpp",
MAME_DIR .. "src/devices/cpu/z80/z84c015.h",
}
+
+ dependency {
+ { MAME_DIR .. "src/devices/cpu/z80/z80.cpp", GEN_DIR .. "emu/cpu/z80/z80.hxx" },
+ { MAME_DIR .. "src/devices/cpu/z80/nsc800.cpp", GEN_DIR .. "emu/cpu/z80/nsc800.hxx" },
+ { MAME_DIR .. "src/devices/cpu/z80/r800.cpp", GEN_DIR .. "emu/cpu/z80/r800.hxx" },
+ { MAME_DIR .. "src/devices/cpu/z80/t6a84.cpp", GEN_DIR .. "emu/cpu/z80/t6a84.hxx" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/devices/cpu/z80/z80.lst", GEN_DIR .. "emu/cpu/z80/z80.hxx", { MAME_DIR .. "src/devices/cpu/z80/z80make.py" }, { "@echo Generating Z80 source file...", PYTHON .. " $(1) $(<) $(@)" } },
+ { MAME_DIR .. "src/devices/cpu/z80/z80.lst", GEN_DIR .. "emu/cpu/z80/nsc800.hxx", { MAME_DIR .. "src/devices/cpu/z80/z80make.py" }, { "@echo Generating NSC800 source file...", PYTHON .. " $(1) nsc800 $(<) $(@)" } },
+ { MAME_DIR .. "src/devices/cpu/z80/z80.lst", GEN_DIR .. "emu/cpu/z80/r800.hxx", { MAME_DIR .. "src/devices/cpu/z80/z80make.py" }, { "@echo Generating R800 source file...", PYTHON .. " $(1) r800 $(<) $(@)" } },
+ { MAME_DIR .. "src/devices/cpu/z80/z80.lst", GEN_DIR .. "emu/cpu/z80/t6a84.hxx", { MAME_DIR .. "src/devices/cpu/z80/z80make.py" }, { "@echo Generating T6A84 source file...", PYTHON .. " $(1) t6a84 $(<) $(@)" } },
+ }
+end
+
+if CPUS["Z80N"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/z80/z80n.cpp",
+ MAME_DIR .. "src/devices/cpu/z80/z80n.h",
+ }
+
+ dependency {
+ { MAME_DIR .. "src/devices/cpu/z80/z80n.cpp", GEN_DIR .. "emu/cpu/z80/z80n.hxx" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/devices/cpu/z80/z80.lst", GEN_DIR .. "emu/cpu/z80/z80n.hxx", { MAME_DIR .. "src/devices/cpu/z80/z80make.py" }, { "@echo Generating Z80N source file...", PYTHON .. " $(1) z80n $(<) $(@)" } },
+ }
end
if CPUS["KC80"] then
@@ -2939,10 +3104,18 @@ local want_disasm_z80 = opt_tool(CPUS, "Z80")
local want_disasm_kc80 = opt_tool(CPUS, "KC80")
if want_disasm_z80 or want_disasm_kc80 then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/r800dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/r800dasm.h")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.h")
end
+if opt_tool(CPUS, "Z80N") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80ndasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80ndasm.h")
+end
+
--------------------------------------------------
-- Sharp LR35902 (Game Boy CPU)
--@src/devices/cpu/lr35902/lr35902.h,CPUS["LR35902"] = true
@@ -3345,6 +3518,16 @@ if opt_tool(CPUS, "SIGMA2") then
end
--------------------------------------------------
+-- Control Data Corporation 160 (disassembler only)
+--@src/devices/cpu/cdc160/cdc160.h,CPUS["CDC160"] = true
+--------------------------------------------------
+
+if opt_tool(CPUS, "CDC160") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cdc160/cdc160d.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cdc160/cdc160d.h")
+end
+
+--------------------------------------------------
-- Control Data Corporation 1700 (disassembler only)
--@src/devices/cpu/cdc1700/cdc1700.h,CPUS["CDC1700"] = true
--------------------------------------------------
@@ -3414,13 +3597,13 @@ if CPUS["NS32000"] 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",
+ MAME_DIR .. "src/devices/cpu/ns32000/common.h",
}
end
if opt_tool(CPUS, "NS32000") then
- table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000dasm.cpp")
- table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000dasm.h")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000d.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000d.h")
end
--------------------------------------------------
@@ -3466,8 +3649,26 @@ if CPUS["F2MC16"] then
files {
MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16.cpp",
MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16.h",
- MAME_DIR .. "src/devices/cpu/f2mc16/mb9061x.cpp",
- MAME_DIR .. "src/devices/cpu/f2mc16/mb9061x.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_adc.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_adc.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_clock.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_clock.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_intc.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_intc.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_port.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_port.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_ppg.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_ppg.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_reload.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_reload.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_uart.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/f2mc16_uart.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/mb90570.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/mb90570.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/mb90610a.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/mb90610a.h",
+ MAME_DIR .. "src/devices/cpu/f2mc16/mb90640a.cpp",
+ MAME_DIR .. "src/devices/cpu/f2mc16/mb90640a.h",
}
end
@@ -3537,10 +3738,17 @@ if opt_tool(CPUS, "DSP56000") then
end
--------------------------------------------------
--- DEC VAX, disassembler only
+-- DEC VAX
--@src/devices/cpu/vax/vax.h,CPUS["VAX"] = true
--------------------------------------------------
+if CPUS["VAX"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/vax/vax.cpp",
+ MAME_DIR .. "src/devices/cpu/vax/vax.h",
+ }
+end
+
if opt_tool(CPUS, "VAX") then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/vax/vaxdasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/vax/vaxdasm.h")
@@ -3741,6 +3949,13 @@ end
--@src/devices/cpu/upd177x/upd177x.h,CPUS["UPD177X"] = true
--------------------------------------------------
+if CPUS["UPD177X"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/upd177x/upd177x.cpp",
+ MAME_DIR .. "src/devices/cpu/upd177x/upd177x.h",
+ }
+end
+
if opt_tool(CPUS, "UPD177X") 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")
@@ -3949,3 +4164,85 @@ if opt_tool(CPUS, "HT1130") then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ht1130/ht1130d.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ht1130/ht1130d.h")
end
+
+--------------------------------------------------
+-- UPD777
+--@src/devices/cpu/upd777/upd777.h,CPUS["UPD777"] = true
+--------------------------------------------------
+
+if CPUS["UPD777"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/upd777/upd777.cpp",
+ MAME_DIR .. "src/devices/cpu/upd777/upd777.h",
+ }
+end
+
+if opt_tool(CPUS, "UPD777") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd777/upd777dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd777/upd777dasm.h")
+end
+
+--------------------------------------------------
+-- Epson C33 STD, C33 ADV, etc.
+--@src/devices/cpu/c33/c33common.h,CPUS["C33"] = true
+--------------------------------------------------
+
+if CPUS["C33"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/c33/c33common.h",
+ MAME_DIR .. "src/devices/cpu/c33/c33helpers.ipp",
+ MAME_DIR .. "src/devices/cpu/c33/c33std.cpp",
+ MAME_DIR .. "src/devices/cpu/c33/c33std.h",
+ MAME_DIR .. "src/devices/cpu/c33/s1c33209.cpp",
+ MAME_DIR .. "src/devices/cpu/c33/s1c33209.h",
+ }
+end
+
+if opt_tool(CPUS, "C33") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/c33/c33dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/c33/c33dasm.h")
+end
+
+--------------------------------------------------
+-- IBM PALM
+--@src/devices/cpu/palm/palm.h,CPUS["PALM"] = true
+--------------------------------------------------
+
+if CPUS["PALM"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/palm/palm.cpp",
+ MAME_DIR .. "src/devices/cpu/palm/palm.h",
+ }
+end
+
+if opt_tool(CPUS, "PALM") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/palm/palmd.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/palm/palmd.h")
+end
+
+--------------------------------------------------
+-- Oki OLMS-66K/nX-8 series
+--@src/devices/cpu/olms66k/msm665xx.h,CPUS["OLMS66K"] = true
+--------------------------------------------------
+
+if CPUS["OLMS66K"] then
+ files {
+ MAME_DIR .. "src/devices/cpu/olms66k/msm665xx.cpp",
+ MAME_DIR .. "src/devices/cpu/olms66k/msm665xx.h",
+ }
+end
+
+if opt_tool(CPUS, "OLMS66K") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/olms66k/nx8dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/olms66k/nx8dasm.h")
+end
+
+--------------------------------------------------
+-- Panasonic MN10300, disassembler only
+--@src/devices/cpu/mn10300/mn10300.h,CPUS["MN10300"] = true
+--------------------------------------------------
+
+if opt_tool(CPUS, "MN10300") then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mn10300/mn103dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mn10300/mn103dasm.h")
+end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index df53570a61e..b73d2cc61a6 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -194,6 +194,8 @@ files {
MAME_DIR .. "src/emu/rendlay.h",
MAME_DIR .. "src/emu/rendutil.cpp",
MAME_DIR .. "src/emu/rendutil.h",
+ MAME_DIR .. "src/emu/resampler.cpp",
+ MAME_DIR .. "src/emu/resampler.h",
MAME_DIR .. "src/emu/romload.cpp",
MAME_DIR .. "src/emu/romload.h",
MAME_DIR .. "src/emu/romentry.h",
@@ -237,20 +239,22 @@ files {
MAME_DIR .. "src/emu/debug/debughlp.h",
MAME_DIR .. "src/emu/debug/debugvw.cpp",
MAME_DIR .. "src/emu/debug/debugvw.h",
+ MAME_DIR .. "src/emu/debug/dvbpoints.cpp",
+ MAME_DIR .. "src/emu/debug/dvbpoints.h",
MAME_DIR .. "src/emu/debug/dvdisasm.cpp",
MAME_DIR .. "src/emu/debug/dvdisasm.h",
+ MAME_DIR .. "src/emu/debug/dvepoints.cpp",
+ MAME_DIR .. "src/emu/debug/dvepoints.h",
MAME_DIR .. "src/emu/debug/dvmemory.cpp",
MAME_DIR .. "src/emu/debug/dvmemory.h",
- MAME_DIR .. "src/emu/debug/dvbpoints.cpp",
- MAME_DIR .. "src/emu/debug/dvbpoints.h",
MAME_DIR .. "src/emu/debug/dvrpoints.cpp",
MAME_DIR .. "src/emu/debug/dvrpoints.h",
- MAME_DIR .. "src/emu/debug/dvwpoints.cpp",
- MAME_DIR .. "src/emu/debug/dvwpoints.h",
MAME_DIR .. "src/emu/debug/dvstate.cpp",
MAME_DIR .. "src/emu/debug/dvstate.h",
MAME_DIR .. "src/emu/debug/dvtext.cpp",
MAME_DIR .. "src/emu/debug/dvtext.h",
+ MAME_DIR .. "src/emu/debug/dvwpoints.cpp",
+ MAME_DIR .. "src/emu/debug/dvwpoints.h",
MAME_DIR .. "src/emu/debug/express.cpp",
MAME_DIR .. "src/emu/debug/express.h",
MAME_DIR .. "src/emu/debug/points.cpp",
@@ -270,6 +274,16 @@ files {
MAME_DIR .. "src/emu/video/rgbsse.h",
MAME_DIR .. "src/emu/video/rgbvmx.cpp",
MAME_DIR .. "src/emu/video/rgbvmx.h",
+ MAME_DIR .. "src/emu/audio_effects/aeffect.h",
+ MAME_DIR .. "src/emu/audio_effects/aeffect.cpp",
+ MAME_DIR .. "src/emu/audio_effects/filter.h",
+ MAME_DIR .. "src/emu/audio_effects/filter.cpp",
+ MAME_DIR .. "src/emu/audio_effects/compressor.h",
+ MAME_DIR .. "src/emu/audio_effects/compressor.cpp",
+ MAME_DIR .. "src/emu/audio_effects/reverb.h",
+ MAME_DIR .. "src/emu/audio_effects/reverb.cpp",
+ MAME_DIR .. "src/emu/audio_effects/eq.h",
+ MAME_DIR .. "src/emu/audio_effects/eq.cpp",
}
pchsource(MAME_DIR .. "src/emu/main.cpp")
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua
index 19281f68a47..58cbb979bb3 100644
--- a/scripts/src/formats.lua
+++ b/scripts/src/formats.lua
@@ -75,6 +75,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/fdi_dsk.cpp",
MAME_DIR .. "src/lib/formats/rpk.cpp",
MAME_DIR .. "src/lib/formats/rpk.h",
+ MAME_DIR .. "src/lib/formats/86f_dsk.cpp",
+ MAME_DIR .. "src/lib/formats/86f_dsk.h",
MAME_DIR .. "src/lib/formats/fsmgr.h",
MAME_DIR .. "src/lib/formats/fsmgr.cpp",
@@ -438,6 +440,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/bk0010_dsk.h,FORMATS["BK0010_DSK"] = true
+--------------------------------------------------
+
+if opt_tool(FORMATS, "BK0010_DSK") then
+ files {
+ MAME_DIR.. "src/lib/formats/bk0010_dsk.cpp",
+ MAME_DIR.. "src/lib/formats/bk0010_dsk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/bw12_dsk.h,FORMATS["BW12_DSK"] = true
--------------------------------------------------
@@ -1038,6 +1052,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/h17disk.h,FORMATS["H17D_DSK"] = true
+--------------------------------------------------
+
+if opt_tool(FORMATS, "H17D_DSK") then
+ files {
+ MAME_DIR.. "src/lib/formats/h17disk.cpp",
+ MAME_DIR.. "src/lib/formats/h17disk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/h8_cas.h,FORMATS["H8_CAS"] = true
--------------------------------------------------
@@ -1134,6 +1160,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/idpart_dsk.h,FORMATS["IDPART_DSK"] = true
+--------------------------------------------------
+
+if opt_tool(FORMATS, "IDPART_DSK") then
+ files {
+ MAME_DIR.. "src/lib/formats/idpart_dsk.cpp",
+ MAME_DIR.. "src/lib/formats/idpart_dsk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/img_dsk.h,FORMATS["IMG_DSK"] = true
--------------------------------------------------
@@ -1747,6 +1785,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/sap_dsk.h,FORMATS["SAP_DSK"] = true
+--------------------------------------------------
+
+if opt_tool(FORMATS, "SAP_DSK") then
+ files {
+ MAME_DIR.. "src/lib/formats/sap_dsk.cpp",
+ MAME_DIR.. "src/lib/formats/sap_dsk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/sc3000_bit.h,FORMATS["SC3000_BIT"] = true
--------------------------------------------------
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 5196e579d12..cc5567207ed 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -95,6 +95,8 @@ end
MAME_DIR .. "src/lib/util/lrucache.h",
MAME_DIR .. "src/lib/util/md5.cpp",
MAME_DIR .. "src/lib/util/md5.h",
+ MAME_DIR .. "src/lib/util/mfpresolve.cpp",
+ MAME_DIR .. "src/lib/util/mfpresolve.h",
MAME_DIR .. "src/lib/util/msdib.cpp",
MAME_DIR .. "src/lib/util/msdib.h",
MAME_DIR .. "src/lib/util/multibyte.h",
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index af09e563671..9df64987200 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -142,18 +142,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/akiko.h,MACHINES["AKIKO"] = true
----------------------------------------------------
-
-if (MACHINES["AKIKO"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/akiko.cpp",
- MAME_DIR .. "src/devices/machine/akiko.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/am2901b.h,MACHINES["AM2901B"] = true
---------------------------------------------------
@@ -164,18 +152,6 @@ if (MACHINES["AM2901B"]~=null) then
}
end
----------------------------------------------------
---
---@src/devices/machine/amiga_copper.h,MACHINES["AMIGA_COPPER"] = true
----------------------------------------------------
-
-if (MACHINES["AMIGA_COPPER"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/amiga_copper.cpp",
- MAME_DIR .. "src/devices/machine/amiga_copper.h",
- }
-end
-
--------------------------------------------------
--
--@src/devices/machine/arm_iomd.h,MACHINES["ARM_IOMD"] = true
@@ -242,19 +218,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/gayle.h,MACHINES["GAYLE"] = true
----------------------------------------------------
-
-if (MACHINES["GAYLE"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/gayle.cpp",
- MAME_DIR .. "src/devices/machine/gayle.h",
- }
-end
-
-
----------------------------------------------------
---
--@src/devices/machine/40105.h,MACHINES["CMOS40105"] = true
---------------------------------------------------
@@ -656,18 +619,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/8530scc.h,MACHINES["8530SCC"] = true
----------------------------------------------------
-
-if (MACHINES["8530SCC"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/8530scc.cpp",
- MAME_DIR .. "src/devices/machine/8530scc.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/adc0804.h,MACHINES["ADC0804"] = true
---------------------------------------------------
@@ -776,18 +727,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/am53cf96.h,MACHINES["AM53CF96"] = true
----------------------------------------------------
-
-if (MACHINES["AM53CF96"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/am53cf96.cpp",
- MAME_DIR .. "src/devices/machine/am53cf96.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/am79c30.h,MACHINES["AM79C30"] = true
---------------------------------------------------
@@ -848,18 +787,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/amigafdc.h,MACHINES["AMIGAFDC"] = true
----------------------------------------------------
-
-if (MACHINES["AMIGAFDC"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/amigafdc.cpp",
- MAME_DIR .. "src/devices/machine/amigafdc.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/applepic.h,MACHINES["APPLEPIC"] = true
---------------------------------------------------
@@ -932,19 +859,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/ataflash.h,MACHINES["ATAFLASH"] = true
----------------------------------------------------
-
-if (MACHINES["ATAFLASH"]~=null) then
- MACHINES["PCCARD"] = true
- files {
- MAME_DIR .. "src/devices/machine/ataflash.cpp",
- MAME_DIR .. "src/devices/machine/ataflash.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/atastorage.h,MACHINES["ATASTORAGE"] = true
---------------------------------------------------
@@ -1231,13 +1145,13 @@ end
---------------------------------------------------
--
---@src/devices/machine/ds1315.h,MACHINES["DS1315"] = true
+--@src/devices/machine/ds1215.h,MACHINES["DS1215"] = true
---------------------------------------------------
-if (MACHINES["DS1315"]~=null) then
+if (MACHINES["DS1215"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/ds1315.cpp",
- MAME_DIR .. "src/devices/machine/ds1315.h",
+ MAME_DIR .. "src/devices/machine/ds1215.cpp",
+ MAME_DIR .. "src/devices/machine/ds1215.h",
}
end
@@ -1351,18 +1265,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/ds8874.h,MACHINES["DS8874"] = true
----------------------------------------------------
-
-if (MACHINES["DS8874"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/ds8874.cpp",
- MAME_DIR .. "src/devices/machine/ds8874.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/e0516.h,MACHINES["E0516"] = true
---------------------------------------------------
@@ -1598,6 +1500,17 @@ if (MACHINES["1MB5"]~=null) then
end
---------------------------------------------------
+--@src/devices/machine/i2chle.h,MACHINES["I2CHLE"] = true
+---------------------------------------------------
+
+if (MACHINES["I2CHLE"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/i2chle.cpp",
+ MAME_DIR .. "src/devices/machine/i2chle.h",
+ }
+end
+
+---------------------------------------------------
--
--@src/devices/machine/i2cmem.h,MACHINES["I2CMEM"] = true
---------------------------------------------------
@@ -1940,6 +1853,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/1801vp128.h,MACHINES["K1801VP128"] = true
+---------------------------------------------------
+
+if (MACHINES["K1801VP128"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/1801vp128.cpp",
+ MAME_DIR .. "src/devices/machine/1801vp128.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/kb3600.h,MACHINES["KB3600"] = true
---------------------------------------------------
@@ -2098,37 +2023,37 @@ end
---------------------------------------------------
--
---@src/devices/machine/ldvp931.h,MACHINES["LDVP931"] = true
+--@src/devices/machine/ldp1450hle.h,MACHINES["LDP1450HLE"] = true
---------------------------------------------------
-if (MACHINES["LDVP931"]~=null) then
+if (MACHINES["LDP1450HLE"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/ldvp931.cpp",
- MAME_DIR .. "src/devices/machine/ldvp931.h",
+ MAME_DIR .. "src/devices/machine/ldp1450hle.cpp",
+ MAME_DIR .. "src/devices/machine/ldp1450hle.h",
}
end
---------------------------------------------------
--
---@src/devices/machine/lh5810.h,MACHINES["LH5810"] = true
+--@src/devices/machine/ldvp931.h,MACHINES["LDVP931"] = true
---------------------------------------------------
-if (MACHINES["LH5810"]~=null) then
+if (MACHINES["LDVP931"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/lh5810.cpp",
- MAME_DIR .. "src/devices/machine/lh5810.h",
+ MAME_DIR .. "src/devices/machine/ldvp931.cpp",
+ MAME_DIR .. "src/devices/machine/ldvp931.h",
}
end
---------------------------------------------------
--
---@src/devices/machine/linflash.h,MACHINES["LINFLASH"] = true
+--@src/devices/machine/lh5810.h,MACHINES["LH5810"] = true
---------------------------------------------------
-if (MACHINES["LINFLASH"]~=null) then
+if (MACHINES["LH5810"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/linflash.cpp",
- MAME_DIR .. "src/devices/machine/linflash.h",
+ MAME_DIR .. "src/devices/machine/lh5810.cpp",
+ MAME_DIR .. "src/devices/machine/lh5810.h",
}
end
@@ -2905,6 +2830,8 @@ if (MACHINES["PCI"]~=null) then
MAME_DIR .. "src/devices/machine/mediagx_cs5530_bridge.h",
MAME_DIR .. "src/devices/machine/mediagx_cs5530_ide.cpp",
MAME_DIR .. "src/devices/machine/mediagx_cs5530_ide.h",
+ MAME_DIR .. "src/devices/machine/mediagx_cs5530_video.cpp",
+ MAME_DIR .. "src/devices/machine/mediagx_cs5530_video.h",
MAME_DIR .. "src/devices/machine/mediagx_host.cpp",
MAME_DIR .. "src/devices/machine/mediagx_host.h",
MAME_DIR .. "src/devices/machine/zfmicro_usb.cpp",
@@ -2974,6 +2901,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/pseudovia.h,MACHINES["PSEUDOVIA"] = true
+---------------------------------------------------
+
+if (MACHINES["PSEUDOVIA"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/pseudovia.cpp",
+ MAME_DIR .. "src/devices/machine/pseudovia.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/psion_asic1.h,MACHINES["PSION_ASIC"] = true
--@src/devices/machine/psion_asic2.h,MACHINES["PSION_ASIC"] = true
--@src/devices/machine/psion_asic3.h,MACHINES["PSION_ASIC"] = true
@@ -3061,6 +3000,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/r65c52.h,MACHINES["R65C52"] = true
+---------------------------------------------------
+
+if (MACHINES["R65C52"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/r65c52.cpp",
+ MAME_DIR .. "src/devices/machine/r65c52.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/ra17xx.h,MACHINES["RA17XX"] = true
---------------------------------------------------
@@ -3077,7 +3028,6 @@ end
---------------------------------------------------
if (MACHINES["RF5C296"]~=null) then
- MACHINES["PCCARD"] = true
files {
MAME_DIR .. "src/devices/machine/rf5c296.cpp",
MAME_DIR .. "src/devices/machine/rf5c296.h",
@@ -3206,6 +3156,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/s2350.h,MACHINES["S2350"] = true
+---------------------------------------------------
+
+if (MACHINES["S2350"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/s2350.cpp",
+ MAME_DIR .. "src/devices/machine/s2350.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/s2636.h,MACHINES["S2636"] = true
---------------------------------------------------
@@ -3299,6 +3261,29 @@ end
---------------------------------------------------
--
+--@src/devices/machine/saa5070.h,MACHINES["SAA5070"] = true
+---------------------------------------------------
+
+if (MACHINES["SAA5070"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/saa5070.cpp",
+ MAME_DIR .. "src/devices/machine/saa5070.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/sc16is741.h,MACHINES["SC16IS741"] = true
+---------------------------------------------------
+if (MACHINES["SC16IS741"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/sc16is741.cpp",
+ MAME_DIR .. "src/devices/machine/sc16is741.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/scc66470.h,MACHINES["SCC66470"] = true
---------------------------------------------------
if (MACHINES["SCC66470"]~=null) then
@@ -3469,18 +3454,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/stvcd.h,MACHINES["STVCD"] = true
----------------------------------------------------
-
-if (MACHINES["STVCD"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/stvcd.cpp",
- MAME_DIR .. "src/devices/machine/stvcd.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/swtpc8212.h,MACHINES["SWTPC8212"] = true
---------------------------------------------------
@@ -3562,6 +3535,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/thmfc1.h,MACHINES["THMFC1"] = true
+---------------------------------------------------
+
+if (MACHINES["THMFC1"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/thmfc1.cpp",
+ MAME_DIR .. "src/devices/machine/thmfc1.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/ticket.h,MACHINES["TICKET"] = true
---------------------------------------------------
@@ -4128,18 +4113,6 @@ end
---------------------------------------------------
--
---@src/devices/machine/pccard.h,MACHINES["PCCARD"] = true
----------------------------------------------------
-
-if (MACHINES["PCCARD"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/pccard.cpp",
- MAME_DIR .. "src/devices/machine/pccard.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/machine/i8255.h,MACHINES["I8255"] = true
---------------------------------------------------
@@ -4441,6 +4414,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/it8705f.h,MACHINES["IT8705F"] = true
+---------------------------------------------------
+
+if (MACHINES["IT8705F"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/it8705f.cpp",
+ MAME_DIR .. "src/devices/machine/it8705f.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/pc87306.h,MACHINES["PC87306"] = true
---------------------------------------------------
@@ -4453,6 +4438,30 @@ end
---------------------------------------------------
--
+--@src/devices/machine/pc97338.h,MACHINES["PC97338"] = true
+---------------------------------------------------
+
+if (MACHINES["PC97338"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/pc97338.cpp",
+ MAME_DIR .. "src/devices/machine/pc97338.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/w83787f.h,MACHINES["W83787F"] = true
+---------------------------------------------------
+
+if (MACHINES["W83787F"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/w83787f.cpp",
+ MAME_DIR .. "src/devices/machine/w83787f.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/w83977tf.h,MACHINES["W83977TF"] = true
---------------------------------------------------
@@ -4538,6 +4547,17 @@ end
---------------------------------------------------
--
+--@src/devices/machine/spi_psram.h,MACHINES["SPIPSRAM"] = true
+---------------------------------------------------
+if (MACHINES["SPIPSRAM"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/spi_psram.cpp",
+ MAME_DIR .. "src/devices/machine/spi_psram.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/spi_sdcard.h,MACHINES["SPISDCARD"] = true
---------------------------------------------------
if (MACHINES["SPISDCARD"]~=null) then
@@ -5284,24 +5304,45 @@ end
---------------------------------------------------
--
---@src/devices/machine/pccard_sram.h,MACHINES["PCCARD_SRAM"] = true
+--@src/devices/machine/tc9223.h,MACHINES["TC9223"] = true
+---------------------------------------------------
+
+if (MACHINES["TC9223"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/tc9223.cpp",
+ MAME_DIR .. "src/devices/machine/tc9223.h",
+ }
+end
+
+---------------------------------------------------
+--@src/devices/machine/upd7261.h,MACHINES["UPD7261"] = true
---------------------------------------------------
-if (MACHINES["PCCARD_SRAM"]~=null) then
+if (MACHINES["UPD7261"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/pccard_sram.cpp",
- MAME_DIR .. "src/devices/machine/pccard_sram.h",
+ MAME_DIR .. "src/devices/machine/upd7261.cpp",
+ MAME_DIR .. "src/devices/machine/upd7261.h",
}
end
---------------------------------------------------
--
---@src/devices/machine/tc9223.h,MACHINES["TC9223"] = true
+--@src/devices/machine/cat702.h,MACHINES["CAT702"] = true
---------------------------------------------------
+if (MACHINES["CAT702"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/cat702.cpp",
+ MAME_DIR .. "src/devices/machine/cat702.h",
+ }
+end
-if (MACHINES["TC9223"]~=null) then
+---------------------------------------------------
+--
+--@src/devices/machine/sci4.h,MACHINES["SCI4"] = true
+---------------------------------------------------
+if (MACHINES["SCI4"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/tc9223.cpp",
- MAME_DIR .. "src/devices/machine/tc9223.h",
+ MAME_DIR .. "src/devices/machine/sci4.cpp",
+ MAME_DIR .. "src/devices/machine/sci4.h",
}
end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 0192d849676..7b1971d0da1 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -151,7 +151,7 @@ end
ext_lib("jpeg"),
"7z",
}
-if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
+if CPU_INCLUDE_DRC_NATIVE then
links {
"asmjit",
}
@@ -220,14 +220,6 @@ end
GEN_DIR .. "resource",
}
- configuration { "vs20*"}
- -- See https://github.com/bkaradzic/GENie/issues/544
- includedirs {
- MAME_DIR .. "scripts/resources/windows/" .. _target,
- GEN_DIR .. "resource",
- }
- configuration { }
-
if (STANDALONE==true) then
standalone();
@@ -269,12 +261,6 @@ if (STANDALONE~=true) then
resincludedirs {
MAME_DIR .. "scripts/resources/windows/mame",
}
- configuration { "vs20*"}
- -- See https://github.com/bkaradzic/GENie/issues/544
- includedirs {
- MAME_DIR .. "scripts/resources/windows/mame",
- }
- configuration { }
end
local mainfile = MAME_DIR .. "src/" .. _target .. "/" .. _subtarget .. ".cpp"
diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua
index cee3aa4a7d7..749b46a3679 100644
--- a/scripts/src/mame/frontend.lua
+++ b/scripts/src/mame/frontend.lua
@@ -89,6 +89,14 @@ files {
MAME_DIR .. "src/frontend/mame/ui/about.h",
MAME_DIR .. "src/frontend/mame/ui/analogipt.cpp",
MAME_DIR .. "src/frontend/mame/ui/analogipt.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/audioeffects.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/audioeffects.h",
+ MAME_DIR .. "src/frontend/mame/ui/audiomix.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/audiomix.h",
+ MAME_DIR .. "src/frontend/mame/ui/audio_effect_eq.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/audio_effect_eq.h",
+ MAME_DIR .. "src/frontend/mame/ui/audio_effect_filter.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/audio_effect_filter.h",
MAME_DIR .. "src/frontend/mame/ui/auditmenu.cpp",
MAME_DIR .. "src/frontend/mame/ui/auditmenu.h",
MAME_DIR .. "src/frontend/mame/ui/barcode.cpp",
@@ -139,6 +147,8 @@ files {
MAME_DIR .. "src/frontend/mame/ui/mainmenu.h",
MAME_DIR .. "src/frontend/mame/ui/menu.cpp",
MAME_DIR .. "src/frontend/mame/ui/menu.h",
+ MAME_DIR .. "src/frontend/mame/ui/midiinout.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/midiinout.h",
MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp",
MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp",
MAME_DIR .. "src/frontend/mame/ui/miscmenu.h",
diff --git a/scripts/src/osd/mac.lua b/scripts/src/osd/mac.lua
index 4ac915a645f..f72c8605365 100644
--- a/scripts/src/osd/mac.lua
+++ b/scripts/src/osd/mac.lua
@@ -103,6 +103,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.h",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.mm",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.mm",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index f779912deb2..b532124302f 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -16,7 +16,7 @@ end
function addlibfromstring(str)
if (str==nil) then return end
for w in str:gmatch("%S+") do
- if string.starts(w,"-l")==true then
+ if string.starts(w,"-l") then
links {
string.sub(w,3)
}
@@ -27,7 +27,7 @@ end
function addoptionsfromstring(str)
if (str==nil) then return end
for w in str:gmatch("%S+") do
- if string.starts(w,"-l")==false then
+ if not string.starts(w,"-l") then
linkoptions {
w
}
@@ -50,16 +50,19 @@ function osdmodulesbuild()
}
files {
- MAME_DIR .. "src/osd/osdnet.cpp",
- MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/watchdog.cpp",
MAME_DIR .. "src/osd/watchdog.h",
+ MAME_DIR .. "src/osd/interface/audio.h",
MAME_DIR .. "src/osd/interface/inputcode.h",
MAME_DIR .. "src/osd/interface/inputdev.h",
MAME_DIR .. "src/osd/interface/inputfwd.h",
MAME_DIR .. "src/osd/interface/inputman.h",
MAME_DIR .. "src/osd/interface/inputseq.cpp",
MAME_DIR .. "src/osd/interface/inputseq.h",
+ MAME_DIR .. "src/osd/interface/midiport.h",
+ MAME_DIR .. "src/osd/interface/nethandler.cpp",
+ MAME_DIR .. "src/osd/interface/nethandler.h",
+ MAME_DIR .. "src/osd/interface/uievents.h",
MAME_DIR .. "src/osd/modules/debugger/debug_module.h",
MAME_DIR .. "src/osd/modules/debugger/debuggdbstub.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
@@ -107,6 +110,8 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/monitor/monitor_module.h",
MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp",
MAME_DIR .. "src/osd/modules/monitor/monitor_win32.cpp",
+ MAME_DIR .. "src/osd/modules/netdev/netdev_common.cpp",
+ MAME_DIR .. "src/osd/modules/netdev/netdev_common.h",
MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
MAME_DIR .. "src/osd/modules/netdev/none.cpp",
MAME_DIR .. "src/osd/modules/netdev/pcap.cpp",
@@ -130,7 +135,9 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/sound/none.cpp",
MAME_DIR .. "src/osd/modules/sound/pa_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/pulse_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/pipewire_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/sound_module.cpp",
MAME_DIR .. "src/osd/modules/sound/sound_module.h",
MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
}
@@ -298,6 +305,22 @@ function osdmodulesbuild()
}
end
+ err = os.execute(pkgconfigcmd() .. " --exists libpipewire-0.3")
+ if not err then
+ _OPTIONS["NO_USE_PIPEWIRE"] = "1"
+ end
+
+ if _OPTIONS["NO_USE_PIPEWIRE"]=="1" then
+ defines {
+ "NO_USE_PIPEWIRE",
+ }
+ else
+ buildoptions {
+ backtick(pkgconfigcmd() .. " --cflags libpipewire-0.3"),
+ }
+ end
+
+
if _OPTIONS["NO_USE_MIDI"]=="1" then
defines {
"NO_USE_MIDI",
@@ -380,12 +403,16 @@ function qtdebuggerbuild()
if _OPTIONS["QT_HOME"]~=nil then
MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
if (MOCTST=='') then
- MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/libexec/moc --version 2>/dev/null")
- if (MOCTST=='') then
+ local qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS")
+ if not string.starts(qt_host_libexecs,"/") then
+ qt_host_libexecs = _OPTIONS["QT_HOME"] .. "/libexec"
+ end
+ MOCTST = backtick(qt_host_libexecs .. "/moc --version 2>/dev/null")
+ if MOCTST=='' then
print("Qt's Meta Object Compiler (moc) wasn't found!")
os.exit(1)
else
- MOC = _OPTIONS["QT_HOME"] .. "/libexec/moc"
+ MOC = qt_host_libexecs .. "/moc"
end
else
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
@@ -395,7 +422,7 @@ function qtdebuggerbuild()
if (MOCTST=='') then
MOCTST = backtick("which moc 2>/dev/null")
end
- if (MOCTST=='') then
+ if MOCTST=='' then
print("Qt's Meta Object Compiler (moc) wasn't found!")
os.exit(1)
end
@@ -490,14 +517,23 @@ function osdmodulestargetconf()
"Qt5Widgets.dll",
}
elseif _OPTIONS["targetos"]=="macosx" then
+ local qt_version = str_to_version(backtick("qmake -query QT_VERSION"))
linkoptions {
"-F" .. backtick("qmake -query QT_INSTALL_LIBS"),
}
- links {
- "Qt5Core.framework",
- "Qt5Gui.framework",
- "Qt5Widgets.framework",
- }
+ if qt_version < 60000 then
+ links {
+ "Qt5Core.framework",
+ "Qt5Gui.framework",
+ "Qt5Widgets.framework",
+ }
+ else
+ links {
+ "QtCore.framework",
+ "QtGui.framework",
+ "QtWidgets.framework",
+ }
+ end
else
if _OPTIONS["QT_HOME"]~=nil then
local qt_version = str_to_version(backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_VERSION"))
@@ -547,6 +583,12 @@ function osdmodulestargetconf()
ext_lib("pulse"),
}
end
+
+ if _OPTIONS["NO_USE_PIPEWIRE"]=="0" then
+ local str = backtick(pkgconfigcmd() .. " --libs libpipewire-0.3")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
end
@@ -650,6 +692,23 @@ if not _OPTIONS["NO_USE_PULSEAUDIO"] then
end
newoption {
+ trigger = "NO_USE_PIPEWIRE",
+ description = "Disable Pipewire interface",
+ allowed = {
+ { "0", "Enable Pipewire" },
+ { "1", "Disable Pipewire" },
+ },
+}
+
+if not _OPTIONS["NO_USE_PIPEWIRE"] then
+ if _OPTIONS["targetos"]=="linux" then
+ _OPTIONS["NO_USE_PIPEWIRE"] = "0"
+ else
+ _OPTIONS["NO_USE_PIPEWIRE"] = "1"
+ end
+end
+
+newoption {
trigger = "MODERN_WIN_API",
description = "Use Modern Windows APIs",
allowed = {
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index cc31fa52008..93dba9ae67a 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -37,12 +37,6 @@ function maintargetosdoptions(_target,_subtarget)
end
end
- if _OPTIONS["USE_WAYLAND"]=="1" then
- links {
- "wayland-egl"
- }
- end
-
if _OPTIONS["NO_USE_XINPUT"]~="1" then
links {
"Xext",
@@ -148,15 +142,6 @@ if not _OPTIONS["NO_X11"] then
end
newoption {
- trigger = "USE_WAYLAND",
- description = "Use Wayland",
- allowed = {
- { "0", "Do not use Wayland (use XWayland or X11)" },
- { "1", "Use Wayland" },
- },
-}
-
-newoption {
trigger = "NO_USE_XINPUT",
description = "Disable use of Xinput",
allowed = {
@@ -372,6 +357,8 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyviewer.h",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.h",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.mm",
+ MAME_DIR .. "src/osd/modules/debugger/osx/exceptionpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.mm",
MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.h",
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 17132ad814a..f3a970c4ad4 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -50,12 +50,6 @@ else
}
end
-if _OPTIONS["USE_WAYLAND"]=="1" then
- defines {
- "SDLMAME_USE_WAYLAND",
- }
-end
-
if _OPTIONS["NO_USE_XINPUT"]=="1" then
defines {
"USE_XINPUT=0",
@@ -134,7 +128,7 @@ if _OPTIONS["targetos"]=="windows" then
defines {
"UNICODE",
"_UNICODE",
- "_WIN32_WINNT=0x0501",
+ "_WIN32_WINNT=0x0600",
"WIN32_LEAN_AND_MEAN",
"NOMINMAX",
}
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 01d441c2214..98893440f9f 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -3,16 +3,12 @@
defines {
"OSD_WINDOWS",
+ "UNICODE",
+ "_UNICODE",
"WIN32_LEAN_AND_MEAN",
"NOMINMAX",
}
-configuration { "mingw* or vs*" }
- defines {
- "UNICODE",
- "_UNICODE"
- }
-
configuration { "vs*" }
flags {
"Unicode",
@@ -33,7 +29,7 @@ if _OPTIONS["MODERN_WIN_API"]=="1" then
}
else
defines {
- "_WIN32_WINNT=0x0600",
+ "_WIN32_WINNT=0x0602",
"NTDDI_VERSION=0x06000000",
}
end
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index fe1b86137cd..32c0d366a60 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -155,22 +155,6 @@ if (SOUNDS["TIA"]~=null) then
}
end
-
-
----------------------------------------------------
--- Amiga audio hardware
---@src/devices/machine/8364_paula.h,SOUNDS["PAULA_8364"] = true
----------------------------------------------------
-
-if (SOUNDS["PAULA_8364"]~=null) then
- files {
- MAME_DIR .. "src/devices/machine/8364_paula.cpp",
- MAME_DIR .. "src/devices/machine/8364_paula.h",
- }
-end
-
-
-
---------------------------------------------------
-- Bally Astrocade sound system
--@src/devices/sound/astrocde.h,SOUNDS["ASTROCADE"] = true
@@ -186,7 +170,6 @@ end
---------------------------------------------------
----------------------------------------------------
-- AC97
--@src/devices/sound/pic-ac97.h,SOUNDS["AC97"] = true
---------------------------------------------------
@@ -197,6 +180,10 @@ if (SOUNDS["AC97"]~=null) then
MAME_DIR .. "src/devices/sound/pci-ac97.h",
}
end
+
+
+
+---------------------------------------------------
-- CEM 3394 analog synthesizer chip
--@src/devices/sound/cem3394.h,SOUNDS["CEM3394"] = true
---------------------------------------------------
@@ -211,6 +198,20 @@ end
---------------------------------------------------
+-- Creative Labs CT1745 SB16 Mixer
+--@src/devices/sound/ct1745.h,SOUNDS["CT1745"] = true
+---------------------------------------------------
+
+if (SOUNDS["CT1745"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/ct1745.cpp",
+ MAME_DIR .. "src/devices/sound/ct1745.h",
+ }
+end
+
+
+
+---------------------------------------------------
-- Creative Labs SB0400 Audigy2 Value
--@src/devices/sound/sb0400.h,SOUNDS["SB0400"] = true
---------------------------------------------------
@@ -236,20 +237,6 @@ if (SOUNDS["ES1373"]~=null) then
end
---------------------------------------------------
--- Data East custom sound chips
---@src/devices/sound/bsmt2000.h,SOUNDS["BSMT2000"] = true
----------------------------------------------------
-
-if (SOUNDS["BSMT2000"]~=null) then
- files {
- MAME_DIR .. "src/devices/sound/bsmt2000.cpp",
- MAME_DIR .. "src/devices/sound/bsmt2000.h",
- }
-end
-
-
-
----------------------------------------------------
-- Ensoniq 5503 (Apple IIgs)
--@src/devices/sound/es5503.h,SOUNDS["ES5503"] = true
---------------------------------------------------
@@ -262,7 +249,6 @@ if (SOUNDS["ES5503"]~=null) then
end
-
---------------------------------------------------
-- Ensoniq 5505/5506
--@src/devices/sound/es5506.h,SOUNDS["ES5505"] = true
@@ -290,6 +276,20 @@ end
---------------------------------------------------
+-- Data East custom sound chips
+--@src/devices/sound/bsmt2000.h,SOUNDS["BSMT2000"] = true
+---------------------------------------------------
+
+if (SOUNDS["BSMT2000"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/bsmt2000.cpp",
+ MAME_DIR .. "src/devices/sound/bsmt2000.h",
+ }
+end
+
+
+
+---------------------------------------------------
-- Excellent Systems ADPCM sound chip
--@src/devices/sound/es8712.h,SOUNDS["ES8712"] = true
---------------------------------------------------
@@ -551,6 +551,20 @@ end
---------------------------------------------------
+-- Micronas DAC 3550A Stereo Audio DAC
+--@src/devices/sound/dac3350a.h,SOUNDS["DAC3350A"] = true
+---------------------------------------------------
+
+if (SOUNDS["DAC3350A"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/dac3350a.cpp",
+ MAME_DIR .. "src/devices/sound/dac3350a.h",
+ }
+end
+
+
+
+---------------------------------------------------
-- MEA8000 Voice Synthesizer
--@src/devices/sound/mea8000.h,SOUNDS["MEA8000"] = true
---------------------------------------------------
@@ -686,17 +700,32 @@ end
---------------------------------------------------
+-- IMA ADPCM sample player
+--@src/devices/sound/imaadpcm.h,SOUNDS["IMAADPCM"] = true
+---------------------------------------------------
+
+if (SOUNDS["IMAADPCM"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/imaadpcm.cpp",
+ MAME_DIR .. "src/devices/sound/imaadpcm.h",
+ }
+end
+
+
+
+---------------------------------------------------
-- OKI ADPCM sample players
--@src/devices/sound/okim6258.h,SOUNDS["OKIM6258"] = true
--@src/devices/sound/msm5205.h,SOUNDS["MSM5205"] = true
--@src/devices/sound/msm5232.h,SOUNDS["MSM5232"] = true
--@src/devices/sound/okim6376.h,SOUNDS["OKIM6376"] = true
--@src/devices/sound/okim6295.h,SOUNDS["OKIM6295"] = true
+--@src/devices/sound/okim6588.h,SOUNDS["OKIM6588"] = true
--@src/devices/sound/okim9810.h,SOUNDS["OKIM9810"] = true
--@src/devices/sound/okiadpcm.h,SOUNDS["OKIADPCM"] = true
---------------------------------------------------
-if (SOUNDS["OKIM6258"]~=null or SOUNDS["OKIM6295"]~=null or SOUNDS["OKIM9810"]~=null or SOUNDS["I5000_SND"]~=null or SOUNDS["OKIADPCM"]~=null) then
+if (SOUNDS["OKIM6258"]~=null or SOUNDS["OKIM6295"]~=null or SOUNDS["OKIM6588"]~=null or SOUNDS["OKIM9810"]~=null or SOUNDS["I5000_SND"]~=null or SOUNDS["OKIADPCM"]~=null) then
files {
MAME_DIR .. "src/devices/sound/okiadpcm.cpp",
MAME_DIR .. "src/devices/sound/okiadpcm.h",
@@ -738,6 +767,13 @@ if (SOUNDS["OKIM6258"]~=null) then
}
end
+if (SOUNDS["OKIM6588"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/okim6588.cpp",
+ MAME_DIR .. "src/devices/sound/okim6588.h",
+ }
+end
+
if (SOUNDS["OKIM9810"]~=null) then
files {
MAME_DIR .. "src/devices/sound/okim9810.cpp",
@@ -1087,8 +1123,6 @@ if (SOUNDS["TMS5220"]~=null) then
MAME_DIR .. "src/devices/sound/tms5220.cpp",
MAME_DIR .. "src/devices/sound/tms5220.h",
MAME_DIR .. "src/devices/sound/tms5110r.hxx",
- MAME_DIR .. "src/devices/machine/spchrom.cpp",
- MAME_DIR .. "src/devices/machine/spchrom.h",
}
end
@@ -1132,6 +1166,29 @@ if (SOUNDS["UPD7752"]~=null) then
}
end
+--------------------------------------------------
+-- Virtual analog envelope generators (EGs)
+--@src/devices/sound/va_eg.h,SOUNDS["VA_EG"] = true
+--------------------------------------------------
+
+if (SOUNDS["VA_EG"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/va_eg.cpp",
+ MAME_DIR .. "src/devices/sound/va_eg.h",
+ }
+end
+
+--------------------------------------------------
+-- Virtual analog voltage-controlled amplifiers (VCAs)
+--@src/devices/sound/va_vca.h,SOUNDS["VA_VCA"] = true
+--------------------------------------------------
+
+if (SOUNDS["VA_VCA"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/va_vca.cpp",
+ MAME_DIR .. "src/devices/sound/va_vca.h",
+ }
+end
---------------------------------------------------
-- VLM5030 speech synthesizer
@@ -1373,18 +1430,6 @@ if (SOUNDS["AD1848"]~=null) then
end
---------------------------------------------------
--- UPD1771
---@src/devices/sound/upd1771.h,SOUNDS["UPD1771"] = true
----------------------------------------------------
-
-if (SOUNDS["UPD1771"]~=null) then
- files {
- MAME_DIR .. "src/devices/sound/upd1771.cpp",
- MAME_DIR .. "src/devices/sound/upd1771.h",
- }
-end
-
----------------------------------------------------
-- GB_SOUND
--@src/devices/sound/gb.h,SOUNDS["GB_SOUND"] = true
---------------------------------------------------
@@ -1432,18 +1477,6 @@ if (SOUNDS["MM5837"]~=null) then
end
---------------------------------------------------
--- Intelligent Designs DAVE
---@src/devices/sound/dave.h,SOUNDS["DAVE"] = true
----------------------------------------------------
-
-if (SOUNDS["DAVE"]~=null) then
- files {
- MAME_DIR .. "src/devices/sound/dave.cpp",
- MAME_DIR .. "src/devices/sound/dave.h",
- }
-end
-
----------------------------------------------------
-- Toshiba TA7630
--@src/devices/sound/ta7630.h,SOUNDS["TA7630"] = true
---------------------------------------------------
@@ -1492,6 +1525,18 @@ if (SOUNDS["LC82310"]~=null) then
end
---------------------------------------------------
+-- NEC uPD931
+--@src/devices/sound/upd931.h,SOUNDS["UPD931"] = true
+---------------------------------------------------
+
+if (SOUNDS["UPD931"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/upd931.cpp",
+ MAME_DIR .. "src/devices/sound/upd931.h",
+ }
+end
+
+---------------------------------------------------
-- NEC uPD933
--@src/devices/sound/upd933.h,SOUNDS["UPD933"] = true
---------------------------------------------------
@@ -1553,6 +1598,18 @@ end
---------------------------------------------------
--
+--@src/devices/sound/swx00.h,SOUNDS["SWX00"] = true
+---------------------------------------------------
+
+if (SOUNDS["SWX00"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/swx00.cpp",
+ MAME_DIR .. "src/devices/sound/swx00.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/sound/meg.h,SOUNDS["MEG"] = true
---------------------------------------------------
@@ -1576,14 +1633,26 @@ if (SOUNDS["XT446"]~=null) then
end
---------------------------------------------------
--- Roland sample players
---@src/devices/sound/rolandpcm.h,SOUNDS["ROLANDPCM"] = true
+-- Roland GP-based sample players
+--@src/devices/sound/roland_gp.h,SOUNDS["ROLANDGP"] = true
+---------------------------------------------------
+
+if (SOUNDS["ROLANDGP"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/roland_gp.cpp",
+ MAME_DIR .. "src/devices/sound/roland_gp.h",
+ }
+end
+
+---------------------------------------------------
+-- Roland LP-based sample players
+--@src/devices/sound/roland_lp.h,SOUNDS["ROLANDLP"] = true
---------------------------------------------------
-if (SOUNDS["ROLANDPCM"]~=null) then
+if (SOUNDS["ROLANDLP"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/rolandpcm.cpp",
- MAME_DIR .. "src/devices/sound/rolandpcm.h",
+ MAME_DIR .. "src/devices/sound/roland_lp.cpp",
+ MAME_DIR .. "src/devices/sound/roland_lp.h",
}
end
@@ -1694,3 +1763,63 @@ if (SOUNDS["AP2010"]~=null) then
MAME_DIR .. "src/devices/sound/ap2010pcm.h",
}
end
+
+---------------------------------------------------
+-- Texas Instruments CF61909
+--@src/devices/sound/cf61909.h,SOUNDS["CF61909"] = true
+---------------------------------------------------
+
+if (SOUNDS["CF61909"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/cf61909.cpp",
+ MAME_DIR .. "src/devices/sound/cf61909.h",
+ }
+end
+
+---------------------------------------------------
+-- NEC uPD65043GF-U01
+--@src/devices/sound/upd65043gfu01.h,SOUNDS["UPD65043GFU01"] = true
+---------------------------------------------------
+
+if (SOUNDS["UPD65043GFU01"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/upd65043gfu01.cpp",
+ MAME_DIR .. "src/devices/sound/upd65043gfu01.h",
+ }
+end
+
+---------------------------------------------------
+-- Casio GT155
+--@src/devices/sound/gt155.h,SOUNDS["GT155"] = true
+---------------------------------------------------
+
+if (SOUNDS["GT155"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/gt155.cpp",
+ MAME_DIR .. "src/devices/sound/gt155.h",
+ }
+end
+
+---------------------------------------------------
+-- Nintendo MMC5 Sound
+--@src/devices/sound/mmc5.h,SOUNDS["MMC5"] = true
+---------------------------------------------------
+
+if (SOUNDS["MMC5"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/mmc5.cpp",
+ MAME_DIR .. "src/devices/sound/mmc5.h",
+ }
+end
+
+---------------------------------------------------
+-- ADCs
+--@src/devices/sound/adc.h,SOUNDS["ADC"] = true
+---------------------------------------------------
+
+if (SOUNDS["ADC"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/adc.cpp",
+ MAME_DIR .. "src/devices/sound/adc.h",
+ }
+end
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 3914a8f4191..e2340724e0c 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -469,7 +469,7 @@ includedirs {
}
defines {
- "NL_DISABLE_DYNAMIC_LOAD=1",
+ "NL_DISABLE_DYNAMIC_LOAD=1",
}
files {
@@ -747,7 +747,7 @@ if _OPTIONS["targetos"] == "macosx" then
}
dependency {
- { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true },
+ { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true },
}
links {
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index 299ba9ba502..1c5c7e53eff 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -199,6 +199,18 @@ if (VIDEOS["DP8350"]~=null) then
}
end
+---------------------------------------------------
+--
+--@src/devices/video/ds8874.h,VIDEOS["DS8874"] = true
+---------------------------------------------------
+
+if (VIDEOS["DS8874"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/ds8874.cpp",
+ MAME_DIR .. "src/devices/video/ds8874.h",
+ }
+end
+
--------------------------------------------------
--
--@src/devices/video/ef9340_1.h,VIDEOS["EF9340_1"] = true
@@ -248,28 +260,6 @@ if (VIDEOS["EF9365"]~=null) then
end
--------------------------------------------------
---@src/devices/video/epic12.h,VIDEOS["EPIC12"] = true
---------------------------------------------------
-
-if (VIDEOS["EPIC12"]~=null) then
- files {
- MAME_DIR .. "src/devices/video/epic12.cpp",
- MAME_DIR .. "src/devices/video/epic12.h",
- MAME_DIR .. "src/devices/video/epic12_blit0.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit1.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit2.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit3.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit4.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit5.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit6.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit7.cpp",
- MAME_DIR .. "src/devices/video/epic12_blit8.cpp",
- MAME_DIR .. "src/devices/video/epic12in.hxx",
- MAME_DIR .. "src/devices/video/epic12pixel.hxx",
- }
-end
-
---------------------------------------------------
--
--@src/devices/video/fixfreq.h,VIDEOS["FIXFREQ"] = true
--------------------------------------------------
@@ -619,13 +609,13 @@ end
--------------------------------------------------
--
---@src/devices/video/lc7582.h,VIDEOS["LC7582"] = true
+--@src/devices/video/lc7580.h,VIDEOS["LC7580"] = true
--------------------------------------------------
-if (VIDEOS["LC7582"]~=null) then
+if (VIDEOS["LC7580"]~=null) then
files {
- MAME_DIR .. "src/devices/video/lc7582.cpp",
- MAME_DIR .. "src/devices/video/lc7582.h",
+ MAME_DIR .. "src/devices/video/lc7580.cpp",
+ MAME_DIR .. "src/devices/video/lc7580.h",
}
end
@@ -811,6 +801,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/mn1252.h,VIDEOS["MN1252"] = true
+--------------------------------------------------
+
+if (VIDEOS["MN1252"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/mn1252.cpp",
+ MAME_DIR .. "src/devices/video/mn1252.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/pc_vga.h,VIDEOS["PC_VGA"] = true
--------------------------------------------------
@@ -823,6 +825,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/pc_vga_alliance.h,VIDEOS["PC_VGA_ALLIANCE"] = true
+--------------------------------------------------
+
+if (VIDEOS["PC_VGA_ALLIANCE"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/pc_vga_alliance.cpp",
+ MAME_DIR .. "src/devices/video/pc_vga_alliance.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/pc_vga_ati.h,VIDEOS["PC_VGA_ATI"] = true
--------------------------------------------------
@@ -895,6 +909,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/pc_vga_mediagx.h,VIDEOS["PC_VGA_MEDIAGX"] = true
+--------------------------------------------------
+
+if (VIDEOS["PC_VGA_MEDIAGX"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/pc_vga_mediagx.cpp",
+ MAME_DIR .. "src/devices/video/pc_vga_mediagx.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/pc_vga_nvidia.h,VIDEOS["PC_VGA_NVIDIA"] = true
--------------------------------------------------
@@ -907,6 +933,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/pc_vga_oak.h,VIDEOS["PC_VGA_OAK"] = true
+--------------------------------------------------
+
+if (VIDEOS["PC_VGA_OAK"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/pc_vga_oak.cpp",
+ MAME_DIR .. "src/devices/video/pc_vga_oak.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/pc_vga_paradise.h,VIDEOS["PC_VGA_PARADISE"] = true
--------------------------------------------------
@@ -1004,19 +1042,6 @@ end
--------------------------------------------------
--
---@src/devices/video/clgd546x_laguna.h,VIDEOS["CLGD546X_LAGUNA"] = true
---------------------------------------------------
-
-if (VIDEOS["CLGD546X_LAGUNA"]~=null) then
- files {
- MAME_DIR .. "src/devices/video/clgd546x_laguna.cpp",
- MAME_DIR .. "src/devices/video/clgd546x_laguna.h",
- }
-end
-
-
---------------------------------------------------
---
--@src/devices/video/pcd8544.h,VIDEOS["PCD8544"] = true
--------------------------------------------------
@@ -1089,6 +1114,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/saa7110.h,VIDEOS["SAA7110"] = true
+--------------------------------------------------
+
+if (VIDEOS["SAA7110"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/saa7110.cpp",
+ MAME_DIR .. "src/devices/video/saa7110.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/sn74s262.h,VIDEOS["SN74S262"] = true
--------------------------------------------------
@@ -1355,18 +1392,6 @@ end
--------------------------------------------------
--
---@src/devices/video/vic4567.h,VIDEOS["VIC4567"] = true
---------------------------------------------------
-
-if (VIDEOS["VIC4567"]~=null) then
- files {
- MAME_DIR .. "src/devices/video/vic4567.cpp",
- MAME_DIR .. "src/devices/video/vic4567.h",
- }
-end
-
---------------------------------------------------
---
--@src/devices/video/v9938.h,VIDEOS["V9938"] = true
--------------------------------------------------
@@ -1498,6 +1523,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/bt431.h,VIDEOS["BT431"] = true
+--------------------------------------------------
+
+if (VIDEOS["BT431"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/bt431.cpp",
+ MAME_DIR .. "src/devices/video/bt431.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/bt459.h,VIDEOS["BT459"] = true
--------------------------------------------------
@@ -1510,37 +1547,61 @@ end
--------------------------------------------------
--
---@src/devices/video/imagetek_i4100.h,VIDEOS["I4100"] = true
+--@src/devices/video/bt45x.h,VIDEOS["BT45X"] = true
--------------------------------------------------
-if (VIDEOS["I4100"]~=null) then
+if (VIDEOS["BT45X"]~=null) then
files {
- MAME_DIR .. "src/devices/video/imagetek_i4100.cpp",
- MAME_DIR .. "src/devices/video/imagetek_i4100.h",
+ MAME_DIR .. "src/devices/video/bt45x.cpp",
+ MAME_DIR .. "src/devices/video/bt45x.h",
}
end
--------------------------------------------------
--
---@src/devices/video/dp8510.h,VIDEOS["DP8510"] = true
+--@src/devices/video/bt47x.h,VIDEOS["BT47X"] = true
--------------------------------------------------
-if (VIDEOS["DP8510"]~=null) then
+if (VIDEOS["BT47X"]~=null) then
files {
- MAME_DIR .. "src/devices/video/dp8510.cpp",
- MAME_DIR .. "src/devices/video/dp8510.h",
+ MAME_DIR .. "src/devices/video/bt47x.cpp",
+ MAME_DIR .. "src/devices/video/bt47x.h",
}
end
--------------------------------------------------
--
---@src/devices/video/bt45x.h,VIDEOS["BT45X"] = true
+--@src/devices/video/bt48x.h,VIDEOS["BT48X"] = true
--------------------------------------------------
-if (VIDEOS["BT45X"]~=null) then
+if (VIDEOS["BT48X"]~=null) then
files {
- MAME_DIR .. "src/devices/video/bt45x.cpp",
- MAME_DIR .. "src/devices/video/bt45x.h",
+ MAME_DIR .. "src/devices/video/bt48x.cpp",
+ MAME_DIR .. "src/devices/video/bt48x.h",
+ }
+end
+
+--------------------------------------------------
+--
+--@src/devices/video/imagetek_i4100.h,VIDEOS["I4100"] = true
+--------------------------------------------------
+
+if (VIDEOS["I4100"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/imagetek_i4100.cpp",
+ MAME_DIR .. "src/devices/video/imagetek_i4100.h",
+ }
+end
+
+--------------------------------------------------
+--
+--@src/devices/video/dp8510.h,VIDEOS["DP8510"] = true
+--------------------------------------------------
+
+if (VIDEOS["DP8510"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/dp8510.cpp",
+ MAME_DIR .. "src/devices/video/dp8510.h",
}
end
@@ -1602,30 +1663,6 @@ end
--------------------------------------------------
--
---@src/devices/video/bt47x.h,VIDEOS["BT47X"] = true
---------------------------------------------------
-
-if (VIDEOS["BT47X"]~=null) then
- files {
- MAME_DIR .. "src/devices/video/bt47x.cpp",
- MAME_DIR .. "src/devices/video/bt47x.h",
- }
-end
-
---------------------------------------------------
---
---@src/devices/video/bt431.h,VIDEOS["BT431"] = true
---------------------------------------------------
-
-if (VIDEOS["BT431"]~=null) then
- files {
- MAME_DIR .. "src/devices/video/bt431.cpp",
- MAME_DIR .. "src/devices/video/bt431.h",
- }
-end
-
---------------------------------------------------
---
--@src/devices/video/vrender0.h,VIDEOS["VRENDER0"] = true
--------------------------------------------------
@@ -1662,6 +1699,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/zr36060.h,VIDEOS["ZR36060"] = true
+--------------------------------------------------
+
+if (VIDEOS["ZR36060"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/zr36060.cpp",
+ MAME_DIR .. "src/devices/video/zr36060.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/zr36110.h,VIDEOS["ZR36110"] = true
--------------------------------------------------
@@ -1671,3 +1720,15 @@ if (VIDEOS["ZR36110"]~=null) then
MAME_DIR .. "src/devices/video/zr36110.h",
}
end
+
+--------------------------------------------------
+--
+--@src/devices/video/bt450.h,VIDEOS["BT450"] = true
+--------------------------------------------------
+
+if (VIDEOS["BT450"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/bt450.cpp",
+ MAME_DIR .. "src/devices/video/bt450.h",
+ }
+end
diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index 457429507e6..06df39602a6 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -52,6 +52,7 @@ function linkProjects_mame_mame(_target, _subtarget)
end
end
end
+ table.sort(projects)
table.insert(projects, "shared") -- must stay at the end
links(projects)
end
@@ -105,6 +106,7 @@ function createProjects_mame_mame(_target, _subtarget)
if 0 < #sources then
createMAMEProjects(_target, _subtarget, name)
+ table.sort(sources)
files(sources)
end
end
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index 3b6b722b6b2..246282a344a 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -158,6 +158,8 @@ files{
MAME_DIR .. "src/mame/midway/williams.h",
MAME_DIR .. "src/mame/midway/williams_m.cpp",
MAME_DIR .. "src/mame/midway/williams_v.cpp",
+ MAME_DIR .. "src/mame/midway/williamsblitter.cpp",
+ MAME_DIR .. "src/mame/midway/williamsblitter.h",
MAME_DIR .. "src/mame/gaelco/gaelco.cpp",
MAME_DIR .. "src/mame/gaelco/gaelco.h",
MAME_DIR .. "src/mame/gaelco/gaelco_v.cpp",
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 966d55d1dbb..59e8bdb504a 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -141,11 +141,6 @@ function toolchain(_buildDir, _subDir)
end
if "linux-gcc" == _OPTIONS["gcc"] then
- -- Force gcc-4.2 on ubuntu-intrepid
- if _OPTIONS["distro"]=="ubuntu-intrepid" then
- premake.gcc.cc = "@gcc -V 4.2"
- premake.gcc.cxx = "@g++-4.2"
- end
premake.gcc.ar = "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux")
end
@@ -163,10 +158,10 @@ function toolchain(_buildDir, _subDir)
end
if "mingw32-gcc" == _OPTIONS["gcc"] then
- if not os.getenv("MINGW32") then
- print("Set MINGW32 envrionment variable.")
- end
if toolchainPrefix == nil or toolchainPrefix == "" then
+ if not os.getenv("MINGW32") then
+ print("Set MINGW32 environment variable.")
+ end
toolchainPrefix = "$(MINGW32)/bin/i686-w64-mingw32-"
end
premake.gcc.cc = toolchainPrefix .. "gcc"
@@ -176,10 +171,10 @@ function toolchain(_buildDir, _subDir)
end
if "mingw64-gcc" == _OPTIONS["gcc"] then
- if not os.getenv("MINGW64") then
- print("Set MINGW64 envrionment variable.")
- end
if toolchainPrefix == nil or toolchainPrefix == "" then
+ if not os.getenv("MINGW64") then
+ print("Set MINGW64 environment variable.")
+ end
toolchainPrefix = "$(MINGW64)/bin/x86_64-w64-mingw32-"
end
premake.gcc.cc = toolchainPrefix .. "gcc"
@@ -211,7 +206,7 @@ function toolchain(_buildDir, _subDir)
premake.gcc.ar = toolchainPrefix .. "ar"
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang")
end
- elseif _ACTION == "vs2019" then
+ elseif _ACTION == "vs2022" then
if "clangcl" == _OPTIONS["vs"] then
premake.vstudio.toolset = ("ClangCL")