summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
committer Vas Crabb <vas@vastheman.com>2019-03-26 11:13:37 +1100
commit97b67170277437131adf6ed4d60139c172529e4f (patch)
tree7a5cbf608f191075f1612b1af15832c206a3fe2d /scripts
parentb380514764cf857469bae61c11143a19f79a74c5 (diff)
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/complay.py10
-rw-r--r--scripts/genie.lua65
-rw-r--r--scripts/src/3rdparty.lua28
-rw-r--r--scripts/src/bus.lua184
-rw-r--r--scripts/src/cpu.lua78
-rw-r--r--scripts/src/formats.lua24
-rw-r--r--scripts/src/machine.lua57
-rw-r--r--scripts/src/main.lua8
-rw-r--r--scripts/src/mame/frontend.lua1
-rw-r--r--scripts/src/netlist.lua12
-rw-r--r--scripts/src/osd/sdl.lua20
-rw-r--r--scripts/src/osd/windows.lua1
-rw-r--r--scripts/src/tools.lua98
-rw-r--r--scripts/src/video.lua36
-rw-r--r--scripts/target/mame/arcade.lua18
-rw-r--r--scripts/target/mame/mess.lua160
-rw-r--r--scripts/target/mame/nl.lua9
17 files changed, 721 insertions, 88 deletions
diff --git a/scripts/build/complay.py b/scripts/build/complay.py
index dff981e65c9..b89ca98e19a 100644
--- a/scripts/build/complay.py
+++ b/scripts/build/complay.py
@@ -455,10 +455,18 @@ class LayoutChecker(Minifyer):
self.handleError('Element %s has inputtag attribute without inputmask attribute' % (name, ))
self.checkTag(attrs['inputtag'], name, 'inputtag')
elif 'inputmask' in attrs:
- self.handleError('Element %s has inputmask attribute without inputtag attirbute' % (name, ))
+ self.handleError('Element %s has inputmask attribute without inputtag attribute' % (name, ))
inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None)
if (inputmask is not None) and (0 == inputmask):
self.handleError('Element %s has attribute inputmask "%s" is zero' % (name, attrs['inputmask']))
+ inputraw = self.checkIntAttribute(name, attrs, 'inputraw', None)
+ if (inputraw is not None):
+ if 'inputmask' not in attrs:
+ self.handleError('Element %s has inputraw attribute without inputmask attribute' % (name, ))
+ if 'inputtag' not in attrs:
+ self.handleError('Element %s has inputraw attribute without inputtag attribute' % (name, ))
+ if ((0 > inputraw) or (1 < inputraw)):
+ self.handleError('Element %s attribute inputraw "%s" not in valid range 0-1' % (name, attrs['inputraw']))
self.handlers.append((self.objectStartHandler, self.objectEndHandler))
self.have_bounds.append(False)
self.have_orientation.append(False)
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 2696ad6db96..b20b8842a66 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -509,6 +509,34 @@ configuration { "Release", "vs20*" }
"NoIncrementalLink",
}
+configuration { "vsllvm" }
+ buildoptions {
+ "/bigobj",
+ }
+ flags {
+ "NoPCH",
+ "ExtraWarnings",
+ }
+ if not _OPTIONS["NOWERROR"] then
+ flags{
+ "FatalWarnings",
+ }
+ end
+
+
+configuration { "Debug", "vsllvm" }
+ flags {
+ "Symbols",
+ "NoMultiProcessorCompilation",
+ }
+
+configuration { "Release", "vsllvm" }
+ flags {
+ "Optimize",
+ "NoEditAndContinue",
+ "NoIncrementalLink",
+ }
+
-- Force VS2015/17 targets to use bundled SDL2
if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then
if _OPTIONS["with-bundled-sdl2"]==nil then
@@ -1266,6 +1294,15 @@ configuration { "mingw-clang" }
}
end
+configuration { "vsllvm" }
+ defines {
+ "XML_STATIC",
+ "WIN32",
+ "_WIN32",
+ "_CRT_NONSTDC_NO_DEPRECATE",
+ "_CRT_SECURE_NO_DEPRECATE",
+ "_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
+ }
configuration { "vs20*" }
defines {
@@ -1276,6 +1313,7 @@ configuration { "vs20*" }
"_CRT_SECURE_NO_DEPRECATE",
"_CRT_STDIO_LEGACY_WIDE_SPECIFIERS",
}
+
-- Windows Store/Phone projects already link against the available libraries.
if _OPTIONS["vs"]==nil or not (string.startswith(_OPTIONS["vs"], "winstore8") or string.startswith(_OPTIONS["vs"], "winphone8")) then
links {
@@ -1417,6 +1455,33 @@ configuration { "winphone8* or winstore8*" }
linkoptions {
"/ignore:4264" -- LNK4264: archiving object file compiled with /ZW into a static library; note that when authoring Windows Runtime types it is not recommended to link with a static library that contains Windows Runtime metadata
}
+configuration { "vsllvm" }
+ buildoptions {
+ "-Wno-tautological-constant-out-of-range-compare",
+ "-Wno-ignored-qualifiers",
+ "-Wno-missing-field-initializers",
+ "-Wno-ignored-pragma-optimize",
+ "-Wno-unknown-warning-option",
+ "-Wno-unused-function",
+ "-Wno-unused-label",
+ "-Wno-unused-local-typedef",
+ "-Wno-unused-const-variable",
+ "-Wno-unused-parameter",
+ "-Wno-unneeded-internal-declaration",
+ "-Wno-unused-private-field",
+ "-Wno-missing-braces",
+ "-Wno-unused-variable",
+ "-Wno-tautological-pointer-compare",
+ "-Wno-nonportable-include-path",
+ "-Wno-enum-conversion",
+ "-Wno-pragma-pack",
+ "-Wno-new-returns-null",
+ "-Wno-sign-compare",
+ "-Wno-switch",
+ "-Wno-tautological-undefined-compare",
+ "-Wno-deprecated-declarations",
+ "-Wno-macro-redefined",
+ }
-- adding this till we sort out asserts in debug mode
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 2ccfa749e19..2a31b4ee392 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -633,6 +633,12 @@ end
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
+ configuration { "vsllvm" }
+ buildoptions {
+ "-Wno-unused-function",
+ "-Wno-enum-conversion",
+ }
+
configuration { }
defines {
"WORDS_BIGENDIAN=0",
@@ -970,6 +976,12 @@ end
"SQLITE_OS_WINRT",
}
+ configuration { "vsllvm" }
+ buildoptions {
+ "-Wno-deprecated-declarations",
+ "-Wno-unused-variable",
+ }
+
configuration { }
files {
@@ -1216,6 +1228,13 @@ project "bgfx"
"/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
"/wd4310", -- warning C4310: cast truncates constant value
}
+
+ configuration { "vsllvm" }
+ buildoptions {
+ "-Wno-unneeded-internal-declaration",
+ "-Wno-unused-const-variable",
+ }
+
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
"/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
@@ -1389,6 +1408,15 @@ project "portaudio"
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
}
+ configuration { "vsllvm" }
+ buildoptions {
+ "-Wno-deprecated-declarations",
+ "-Wno-missing-braces",
+ "-Wno-unused-variable",
+ "-Wno-switch",
+ "-Wno-unused-function",
+ }
+
configuration { "gmake or ninja" }
buildoptions_c {
"-Wno-strict-prototypes",
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index a80e2f6e127..14130a37ae7 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -209,6 +209,8 @@ if (BUSES["APRICOT_EXPANSION"]~=null) then
MAME_DIR .. "src/devices/bus/apricot/expansion/cards.h",
MAME_DIR .. "src/devices/bus/apricot/expansion/ram.cpp",
MAME_DIR .. "src/devices/bus/apricot/expansion/ram.h",
+ MAME_DIR .. "src/devices/bus/apricot/expansion/winchester.cpp",
+ MAME_DIR .. "src/devices/bus/apricot/expansion/winchester.h",
}
end
@@ -258,6 +260,16 @@ if (BUSES["ASTROCADE"]~=null) then
MAME_DIR .. "src/devices/bus/astrocde/exp.h",
MAME_DIR .. "src/devices/bus/astrocde/ram.cpp",
MAME_DIR .. "src/devices/bus/astrocde/ram.h",
+ MAME_DIR .. "src/devices/bus/astrocde/ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/astrocde/ctrl.h",
+ MAME_DIR .. "src/devices/bus/astrocde/joy.cpp",
+ MAME_DIR .. "src/devices/bus/astrocde/joy.h",
+ MAME_DIR .. "src/devices/bus/astrocde/cassette.cpp",
+ MAME_DIR .. "src/devices/bus/astrocde/cassette.h",
+ MAME_DIR .. "src/devices/bus/astrocde/accessory.cpp",
+ MAME_DIR .. "src/devices/bus/astrocde/accessory.h",
+ MAME_DIR .. "src/devices/bus/astrocde/lightpen.cpp",
+ MAME_DIR .. "src/devices/bus/astrocde/lightpen.h",
}
end
@@ -357,6 +369,8 @@ if (BUSES["BBC_1MHZBUS"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.h",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.h",
}
@@ -365,6 +379,29 @@ end
---------------------------------------------------
--
+--@src/devices/bus/bbc/rom/slot.h,BUSES["BBC_ROM"] = true
+---------------------------------------------------
+
+if (BUSES["BBC_ROM"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/bbc/rom/slot.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/rom/slot.h",
+ MAME_DIR .. "src/devices/bus/bbc/rom/rom.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/rom/rom.h",
+ MAME_DIR .. "src/devices/bus/bbc/rom/ram.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/rom/ram.h",
+ MAME_DIR .. "src/devices/bus/bbc/rom/dfs.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/rom/dfs.h",
+ MAME_DIR .. "src/devices/bus/bbc/rom/pal.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/rom/pal.h",
+ MAME_DIR .. "src/devices/bus/bbc/rom/rtc.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/rom/rtc.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/bbc/tube/tube.h,BUSES["BBC_TUBE"] = true
---------------------------------------------------
@@ -372,6 +409,8 @@ if (BUSES["BBC_TUBE"]~=null) then
files {
MAME_DIR .. "src/devices/bus/bbc/tube/tube.cpp",
MAME_DIR .. "src/devices/bus/bbc/tube/tube.h",
+ MAME_DIR .. "src/devices/bus/bbc/tube/tube_32016.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/tube/tube_32016.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_6502.cpp",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_6502.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_80186.cpp",
@@ -689,24 +728,34 @@ end
---------------------------------------------------
--
---@src/devices/bus/coleco/ctrl.h,BUSES["COLECO"] = true
---@src/devices/bus/coleco/exp.h,BUSES["COLECO"] = true
+--@src/devices/bus/coleco/controller/ctrl.h,BUSES["COLECO_CONTROLLER"] = true
---------------------------------------------------
-if (BUSES["COLECO"]~=null) then
+if (BUSES["COLECO_CONTROLLER"]~=null) then
files {
- MAME_DIR .. "src/devices/bus/coleco/ctrl.cpp",
- MAME_DIR .. "src/devices/bus/coleco/ctrl.h",
- MAME_DIR .. "src/devices/bus/coleco/hand.cpp",
- MAME_DIR .. "src/devices/bus/coleco/hand.h",
- MAME_DIR .. "src/devices/bus/coleco/sac.cpp",
- MAME_DIR .. "src/devices/bus/coleco/sac.h",
- MAME_DIR .. "src/devices/bus/coleco/exp.cpp",
- MAME_DIR .. "src/devices/bus/coleco/exp.h",
- MAME_DIR .. "src/devices/bus/coleco/std.cpp",
- MAME_DIR .. "src/devices/bus/coleco/std.h",
- MAME_DIR .. "src/devices/bus/coleco/xin1.h",
- MAME_DIR .. "src/devices/bus/coleco/xin1.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/controller/ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/controller/ctrl.h",
+ MAME_DIR .. "src/devices/bus/coleco/controller/hand.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/controller/hand.h",
+ MAME_DIR .. "src/devices/bus/coleco/controller/sac.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/controller/sac.h",
+ }
+end
+
+
+---------------------------------------------------
+--
+--@src/devices/bus/coleco/exp.h,BUSES["COLECO_CART"] = true
+---------------------------------------------------
+
+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/std.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/cartridge/std.h",
+ MAME_DIR .. "src/devices/bus/coleco/cartridge/xin1.h",
+ MAME_DIR .. "src/devices/bus/coleco/cartridge/xin1.cpp",
}
end
@@ -811,6 +860,8 @@ if (BUSES["ELECTRON"]~=null) then
MAME_DIR .. "src/devices/bus/electron/fbjoy.h",
MAME_DIR .. "src/devices/bus/electron/plus1.cpp",
MAME_DIR .. "src/devices/bus/electron/plus1.h",
+ MAME_DIR .. "src/devices/bus/electron/plus2.cpp",
+ MAME_DIR .. "src/devices/bus/electron/plus2.h",
MAME_DIR .. "src/devices/bus/electron/plus3.cpp",
MAME_DIR .. "src/devices/bus/electron/plus3.h",
MAME_DIR .. "src/devices/bus/electron/pwrjoy.cpp",
@@ -838,6 +889,8 @@ if (BUSES["ELECTRON_CART"]~=null) then
MAME_DIR .. "src/devices/bus/electron/cart/abr.h",
MAME_DIR .. "src/devices/bus/electron/cart/ap34.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/ap34.h",
+ MAME_DIR .. "src/devices/bus/electron/cart/ap5.cpp",
+ MAME_DIR .. "src/devices/bus/electron/cart/ap5.h",
MAME_DIR .. "src/devices/bus/electron/cart/aqr.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/aqr.h",
MAME_DIR .. "src/devices/bus/electron/cart/click.cpp",
@@ -848,6 +901,8 @@ if (BUSES["ELECTRON_CART"]~=null) then
MAME_DIR .. "src/devices/bus/electron/cart/mgc.h",
MAME_DIR .. "src/devices/bus/electron/cart/peg400.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/peg400.h",
+ MAME_DIR .. "src/devices/bus/electron/cart/romp144.cpp",
+ MAME_DIR .. "src/devices/bus/electron/cart/romp144.h",
MAME_DIR .. "src/devices/bus/electron/cart/sndexp.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/sndexp.h",
MAME_DIR .. "src/devices/bus/electron/cart/sndexp3.cpp",
@@ -858,6 +913,8 @@ if (BUSES["ELECTRON_CART"]~=null) then
MAME_DIR .. "src/devices/bus/electron/cart/std.h",
MAME_DIR .. "src/devices/bus/electron/cart/stlefs.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/stlefs.h",
+ MAME_DIR .. "src/devices/bus/electron/cart/tube.cpp",
+ MAME_DIR .. "src/devices/bus/electron/cart/tube.h",
}
end
@@ -1161,6 +1218,8 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/hdc.h",
MAME_DIR .. "src/devices/bus/isa/ibm_mfc.cpp",
MAME_DIR .. "src/devices/bus/isa/ibm_mfc.h",
+ MAME_DIR .. "src/devices/bus/isa/cl_sh260.cpp",
+ MAME_DIR .. "src/devices/bus/isa/cl_sh260.h",
MAME_DIR .. "src/devices/bus/isa/mpu401.cpp",
MAME_DIR .. "src/devices/bus/isa/mpu401.h",
MAME_DIR .. "src/devices/bus/isa/sblaster.cpp",
@@ -1175,8 +1234,12 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/xtide.h",
MAME_DIR .. "src/devices/bus/isa/side116.cpp",
MAME_DIR .. "src/devices/bus/isa/side116.h",
- MAME_DIR .. "src/devices/bus/isa/aha1542.cpp",
- MAME_DIR .. "src/devices/bus/isa/aha1542.h",
+ MAME_DIR .. "src/devices/bus/isa/aha1542b.cpp",
+ MAME_DIR .. "src/devices/bus/isa/aha1542b.h",
+ MAME_DIR .. "src/devices/bus/isa/aha1542c.cpp",
+ MAME_DIR .. "src/devices/bus/isa/aha1542c.h",
+ MAME_DIR .. "src/devices/bus/isa/aha174x.cpp",
+ MAME_DIR .. "src/devices/bus/isa/aha174x.h",
MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.cpp",
MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.h",
MAME_DIR .. "src/devices/bus/isa/wd1007a.cpp",
@@ -1251,6 +1314,12 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/eis_sad8852.h",
MAME_DIR .. "src/devices/bus/isa/lbaenhancer.cpp",
MAME_DIR .. "src/devices/bus/isa/lbaenhancer.h",
+ MAME_DIR .. "src/devices/bus/isa/np600.cpp",
+ MAME_DIR .. "src/devices/bus/isa/np600.h",
+ MAME_DIR .. "src/devices/bus/isa/bt54x.cpp",
+ MAME_DIR .. "src/devices/bus/isa/bt54x.h",
+ MAME_DIR .. "src/devices/bus/isa/dcb.cpp",
+ MAME_DIR .. "src/devices/bus/isa/dcb.h",
}
end
@@ -1270,6 +1339,19 @@ if (BUSES["ISBX"]~=null) then
}
end
+---------------------------------------------------
+--
+--@src/devices/bus/jakks_gamekey/slot.h,BUSES["JAKKS_GAMEKEY"] = true
+---------------------------------------------------
+
+if (BUSES["JAKKS_GAMEKEY"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/jakks_gamekey/slot.cpp",
+ MAME_DIR .. "src/devices/bus/jakks_gamekey/slot.h",
+ MAME_DIR .. "src/devices/bus/jakks_gamekey/rom.cpp",
+ MAME_DIR .. "src/devices/bus/jakks_gamekey/rom.h",
+ }
+end
---------------------------------------------------
--
@@ -1354,6 +1436,21 @@ end
---------------------------------------------------
--
+--@src/devices/bus/mtx/exp.h,BUSES["MTX"] = true
+---------------------------------------------------
+
+if (BUSES["MTX"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/mtx/exp.cpp",
+ MAME_DIR .. "src/devices/bus/mtx/exp.h",
+ MAME_DIR .. "src/devices/bus/mtx/sdx.cpp",
+ MAME_DIR .. "src/devices/bus/mtx/sdx.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/kc/kc.h,BUSES["KC"] = true
---------------------------------------------------
@@ -2573,10 +2670,14 @@ 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/sk1100.cpp",
- MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.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/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",
}
end
@@ -3204,6 +3305,8 @@ if (BUSES["SPECTRUM"]~=null) then
files {
MAME_DIR .. "src/devices/bus/spectrum/exp.cpp",
MAME_DIR .. "src/devices/bus/spectrum/exp.h",
+ MAME_DIR .. "src/devices/bus/spectrum/beta.cpp",
+ MAME_DIR .. "src/devices/bus/spectrum/beta.h",
MAME_DIR .. "src/devices/bus/spectrum/intf1.cpp",
MAME_DIR .. "src/devices/bus/spectrum/intf1.h",
MAME_DIR .. "src/devices/bus/spectrum/intf2.cpp",
@@ -3214,12 +3317,18 @@ if (BUSES["SPECTRUM"]~=null) then
MAME_DIR .. "src/devices/bus/spectrum/kempjoy.h",
MAME_DIR .. "src/devices/bus/spectrum/melodik.cpp",
MAME_DIR .. "src/devices/bus/spectrum/melodik.h",
+ MAME_DIR .. "src/devices/bus/spectrum/mface.cpp",
+ MAME_DIR .. "src/devices/bus/spectrum/mface.h",
MAME_DIR .. "src/devices/bus/spectrum/mikroplus.cpp",
MAME_DIR .. "src/devices/bus/spectrum/mikroplus.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",
MAME_DIR .. "src/devices/bus/spectrum/plus2test.h",
MAME_DIR .. "src/devices/bus/spectrum/protek.cpp",
MAME_DIR .. "src/devices/bus/spectrum/protek.h",
+ MAME_DIR .. "src/devices/bus/spectrum/specdrum.cpp",
+ MAME_DIR .. "src/devices/bus/spectrum/specdrum.h",
MAME_DIR .. "src/devices/bus/spectrum/uslot.cpp",
MAME_DIR .. "src/devices/bus/spectrum/uslot.h",
MAME_DIR .. "src/devices/bus/spectrum/usource.cpp",
@@ -3231,6 +3340,41 @@ end
---------------------------------------------------
--
+--@src/devices/bus/uts_kbd/uts_kbd.h,BUSES["UTS_KBD"] = true
+---------------------------------------------------
+
+if (BUSES["UTS_KBD"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/uts_kbd/400kbd.cpp",
+ MAME_DIR .. "src/devices/bus/uts_kbd/400kbd.h",
+ MAME_DIR .. "src/devices/bus/uts_kbd/extw.cpp",
+ MAME_DIR .. "src/devices/bus/uts_kbd/extw.h",
+ MAME_DIR .. "src/devices/bus/uts_kbd/uts_kbd.cpp",
+ MAME_DIR .. "src/devices/bus/uts_kbd/uts_kbd.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/vsmile/vsmile_ctrl.h,BUSES["VSMILE"] = true
+--@src/devices/bus/vsmile/vsmile_slot.h,BUSES["VSMILE"] = true
+---------------------------------------------------
+
+if (BUSES["VSMILE"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/vsmile/vsmile_ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/vsmile/vsmile_ctrl.h",
+ MAME_DIR .. "src/devices/bus/vsmile/pad.cpp",
+ MAME_DIR .. "src/devices/bus/vsmile/pad.h",
+ MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.cpp",
+ MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.h",
+ MAME_DIR .. "src/devices/bus/vsmile/rom.cpp",
+ MAME_DIR .. "src/devices/bus/vsmile/rom.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/vtech/memexp/memexp.h,BUSES["VTECH_MEMEXP"] = true
---------------------------------------------------
@@ -3497,6 +3641,8 @@ if (BUSES["HP9845_IO"]~=null) then
MAME_DIR .. "src/devices/bus/hp9845_io/98034.h",
MAME_DIR .. "src/devices/bus/hp9845_io/98035.cpp",
MAME_DIR .. "src/devices/bus/hp9845_io/98035.h",
+ MAME_DIR .. "src/devices/bus/hp9845_io/hp9885.cpp",
+ MAME_DIR .. "src/devices/bus/hp9845_io/hp9885.h",
}
end
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 08fe95f7f68..8c461e0ce16 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -13,7 +13,7 @@
-- Dynamic recompiler objects
--------------------------------------------------
-DRC_CPUS = { "E1", "SH", "MIPS3", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16" }
+DRC_CPUS = { "E1", "SH", "MIPS3", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16", "UNSP" }
CPU_INCLUDE_DRC = false
for i, v in ipairs(DRC_CPUS) do
if (CPUS[v]~=null) then
@@ -1087,6 +1087,7 @@ if (CPUS["I386"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/i386/i386.cpp",
MAME_DIR .. "src/devices/cpu/i386/i386.h",
+ MAME_DIR .. "src/devices/cpu/i386/cache.h",
MAME_DIR .. "src/devices/cpu/i386/cycles.h",
MAME_DIR .. "src/devices/cpu/i386/i386op16.hxx",
MAME_DIR .. "src/devices/cpu/i386/i386op32.hxx",
@@ -1297,6 +1298,7 @@ end
--------------------------------------------------
-- MIPS R4000 (MIPS III/IV) series
--@src/devices/cpu/mips/mips3.h,CPUS["MIPS3"] = true
+--@src/devices/cpu/mips/r4000.h,CPUS["MIPS3"] = true
--------------------------------------------------
if (CPUS["MIPS3"]~=null) then
@@ -1313,6 +1315,8 @@ if (CPUS["MIPS3"]~=null) then
MAME_DIR .. "src/devices/cpu/mips/ps2vu.h",
MAME_DIR .. "src/devices/cpu/mips/ps2vif1.cpp",
MAME_DIR .. "src/devices/cpu/mips/ps2vif1.h",
+ MAME_DIR .. "src/devices/cpu/mips/r4000.cpp",
+ MAME_DIR .. "src/devices/cpu/mips/r4000.h",
}
end
@@ -2157,6 +2161,10 @@ if (CPUS["UNSP"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/unsp/unsp.cpp",
MAME_DIR .. "src/devices/cpu/unsp/unsp.h",
+ MAME_DIR .. "src/devices/cpu/unsp/unspdefs.h",
+ MAME_DIR .. "src/devices/cpu/unsp/unspdrc.cpp",
+ MAME_DIR .. "src/devices/cpu/unsp/unspfe.cpp",
+ MAME_DIR .. "src/devices/cpu/unsp/unspfe.h",
}
end
@@ -2776,3 +2784,71 @@ if (_OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.h")
end
+
+--------------------------------------------------
+-- DEC Alpha (EV4/EV5/EV6/EV7) series
+--@src/devices/cpu/alpha/alpha.h,CPUS["ALPHA"] = true
+--------------------------------------------------
+
+if (CPUS["ALPHA"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/alpha/alpha.cpp",
+ MAME_DIR .. "src/devices/cpu/alpha/alpha.h",
+ }
+end
+
+if (CPUS["ALPHA"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alpha/alphad.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alpha/alphad.h")
+end
+
+--------------------------------------------------
+-- National Semiconductor HPC
+--@src/devices/cpu/hpc/hpc.h,CPUS["HPC"] = true
+--------------------------------------------------
+
+if (CPUS["HPC"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/hpc/hpc.cpp",
+ MAME_DIR .. "src/devices/cpu/hpc/hpc.h",
+ }
+end
+
+if (CPUS["HPC"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hpc/hpcdasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hpc/hpcdasm.h")
+end
+
+--------------------------------------------------
+-- Yamaha Multiple Effects Generator
+--@src/devices/sound/meg.h,CPUS["MEG"] = true
+--------------------------------------------------
+
+if (CPUS["MEG"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/meg.cpp",
+ MAME_DIR .. "src/devices/sound/meg.h",
+ }
+end
+
+if (CPUS["MEG"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/sound/megd.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/sound/megd.h")
+end
+
+--------------------------------------------------
+-- National Semiconductor NS32000 series
+--@src/devices/cpu/ns32000/ns32000.h,CPUS["NS32000"] = true
+--------------------------------------------------
+
+if (CPUS["NS32000"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/ns32000/ns32000.cpp",
+ MAME_DIR .. "src/devices/cpu/ns32000/ns32000.h",
+ }
+end
+
+if (CPUS["NS32000"]~=null or _OPTIONS["with-tools"]) 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")
+end
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua
index b25909dbb3a..9e7a2a1eb5a 100644
--- a/scripts/src/formats.lua
+++ b/scripts/src/formats.lua
@@ -1147,6 +1147,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/mtx_dsk.h,FORMATS["MTX_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["MTX_DSK"]~=null or _OPTIONS["with-tools"]) then
+ files {
+ MAME_DIR.. "src/lib/formats/mtx_dsk.cpp",
+ MAME_DIR.. "src/lib/formats/mtx_dsk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/mz_cas.h,FORMATS["MZ_CAS"] = true
--------------------------------------------------
@@ -1219,6 +1231,18 @@ end
--------------------------------------------------
--
+--@src/lib/formats/opd_dsk.h,FORMATS["OPD_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["OPD_DSK"]~=null or _OPTIONS["with-tools"]) then
+ files {
+ MAME_DIR.. "src/lib/formats/opd_dsk.cpp",
+ MAME_DIR.. "src/lib/formats/opd_dsk.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/lib/formats/orao_cas.h,FORMATS["ORAO_CAS"] = true
--------------------------------------------------
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 4e74fd9e6c3..fa451ae5dc6 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -2622,6 +2622,12 @@ if (MACHINES["SPG2XX"]~=null) then
files {
MAME_DIR .. "src/devices/machine/spg2xx.cpp",
MAME_DIR .. "src/devices/machine/spg2xx.h",
+ MAME_DIR .. "src/devices/machine/spg2xx_audio.cpp",
+ MAME_DIR .. "src/devices/machine/spg2xx_audio.h",
+ MAME_DIR .. "src/devices/machine/spg2xx_io.cpp",
+ MAME_DIR .. "src/devices/machine/spg2xx_io.h",
+ MAME_DIR .. "src/devices/machine/spg110.cpp",
+ MAME_DIR .. "src/devices/machine/spg110.h",
}
end
@@ -2912,38 +2918,37 @@ end
---------------------------------------------------
--
---@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true
+--@src/devices/machine/wd1010.h,MACHINES["WD1010"] = true
---------------------------------------------------
-if (MACHINES["WD11C00_17"]~=null) then
+if (MACHINES["WD1010"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/wd11c00_17.cpp",
- MAME_DIR .. "src/devices/machine/wd11c00_17.h",
+ MAME_DIR .. "src/devices/machine/wd1010.cpp",
+ MAME_DIR .. "src/devices/machine/wd1010.h",
}
end
---------------------------------------------------
--
---@src/devices/machine/wd2010.h,MACHINES["WD2010"] = true
+--@src/devices/machine/wd11c00_17.h,MACHINES["WD11C00_17"] = true
---------------------------------------------------
-if (MACHINES["WD2010"]~=null) then
+if (MACHINES["WD11C00_17"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/wd2010.cpp",
- MAME_DIR .. "src/devices/machine/wd2010.h",
+ MAME_DIR .. "src/devices/machine/wd11c00_17.cpp",
+ MAME_DIR .. "src/devices/machine/wd11c00_17.h",
}
end
---------------------------------------------------
--
---@src/devices/machine/wd33c93.h,MACHINES["WD33C93"] = true
+--@src/devices/machine/wd2010.h,MACHINES["WD2010"] = true
---------------------------------------------------
-if (MACHINES["WD33C93"]~=null) then
- MACHINES["SCSI"] = true
+if (MACHINES["WD2010"]~=null) then
files {
- MAME_DIR .. "src/devices/machine/wd33c93.cpp",
- MAME_DIR .. "src/devices/machine/wd33c93.h",
+ MAME_DIR .. "src/devices/machine/wd2010.cpp",
+ MAME_DIR .. "src/devices/machine/wd2010.h",
}
end
@@ -3867,4 +3872,28 @@ if (MACHINES["DC7085"]~=null) then
MAME_DIR .. "src/devices/machine/dc7085.cpp",
MAME_DIR .. "src/devices/machine/dc7085.h",
}
-end \ No newline at end of file
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/i82357.h,MACHINES["I82357"] = true
+---------------------------------------------------
+
+if (MACHINES["I82357"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/i82357.cpp",
+ MAME_DIR .. "src/devices/machine/i82357.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/xc1700e.h,MACHINES["XC1700E"] = true
+---------------------------------------------------
+
+if (MACHINES["XC1700E"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/xc1700e.cpp",
+ MAME_DIR .. "src/devices/machine/xc1700e.h",
+ }
+end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index bec62ff6f49..ad0e1a1d08c 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -256,6 +256,7 @@ end
"utils",
ext_lib("expat"),
"softfloat",
+ "softfloat3",
ext_lib("jpeg"),
"7z",
}
@@ -419,6 +420,13 @@ if (STANDALONE~=true) then
"@echo Emitting ".. rctarget .. "vers.rc...",
PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" ,
}
+
+ configuration { "vsllvm" }
+ prebuildcommands {
+ "mkdir \"" .. path.translate(GEN_DIR .. "resource/","\\") .. "\" 2>NUL",
+ "@echo Emitting ".. rctarget .. "vers.rc...",
+ PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" ,
+ }
end
configuration { }
diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua
index 60e955f8773..c8f21daa4a6 100644
--- a/scripts/src/mame/frontend.lua
+++ b/scripts/src/mame/frontend.lua
@@ -137,6 +137,7 @@ files {
MAME_DIR .. "src/frontend/mame/ui/defimg.ipp",
MAME_DIR .. "src/frontend/mame/ui/dirmenu.cpp",
MAME_DIR .. "src/frontend/mame/ui/dirmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/icorender.cpp",
MAME_DIR .. "src/frontend/mame/ui/icorender.h",
MAME_DIR .. "src/frontend/mame/ui/inifile.cpp",
MAME_DIR .. "src/frontend/mame/ui/inifile.h",
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 29eb931f916..e24eb2d26ef 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -32,6 +32,7 @@ project "netlist"
includedirs {
MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/netlist",
}
files {
@@ -47,9 +48,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/nl_parser.h",
MAME_DIR .. "src/lib/netlist/nl_setup.cpp",
MAME_DIR .. "src/lib/netlist/nl_setup.h",
- MAME_DIR .. "src/lib/netlist/nl_time.h",
+ MAME_DIR .. "src/lib/netlist/nl_types.h",
MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
- MAME_DIR .. "src/lib/netlist/plib/palloc.cpp",
MAME_DIR .. "src/lib/netlist/plib/palloc.h",
MAME_DIR .. "src/lib/netlist/plib/pchrono.cpp",
MAME_DIR .. "src/lib/netlist/plib/pchrono.h",
@@ -64,6 +64,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pdynlib.h",
MAME_DIR .. "src/lib/netlist/plib/pmain.cpp",
MAME_DIR .. "src/lib/netlist/plib/pmain.h",
+ MAME_DIR .. "src/lib/netlist/plib/pmempool.h",
MAME_DIR .. "src/lib/netlist/plib/pomp.h",
MAME_DIR .. "src/lib/netlist/plib/poptions.cpp",
MAME_DIR .. "src/lib/netlist/plib/poptions.h",
@@ -74,10 +75,9 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pstate.h",
MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
MAME_DIR .. "src/lib/netlist/plib/pstring.h",
- MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
- MAME_DIR .. "src/lib/netlist/plib/pstring.h",
MAME_DIR .. "src/lib/netlist/plib/pstream.cpp",
MAME_DIR .. "src/lib/netlist/plib/pstream.h",
+ MAME_DIR .. "src/lib/netlist/plib/ptime.h",
MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
MAME_DIR .. "src/lib/netlist/plib/putil.cpp",
MAME_DIR .. "src/lib/netlist/plib/putil.h",
@@ -85,6 +85,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/tools/nl_convert.h",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp",
MAME_DIR .. "src/lib/netlist/analog/nld_bjt.h",
+ MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.cpp",
+ MAME_DIR .. "src/lib/netlist/analog/nld_mosfet.h",
MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.cpp",
MAME_DIR .. "src/lib/netlist/analog/nlid_fourterm.h",
MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h",
@@ -140,6 +142,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/devices/nld_7490.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7493.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7493.h",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7497.cpp",
+ MAME_DIR .. "src/lib/netlist/devices/nld_7497.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74107.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_74107.h",
MAME_DIR .. "src/lib/netlist/devices/nld_74123.cpp",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 9ef57e0ba7c..c9a63dcb24e 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -52,16 +52,16 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "mingw*"}
links {
"SDL2",
- "Imm32",
- "Version",
- "Ole32",
- "OleAut32",
+ "imm32",
+ "version",
+ "ole32",
+ "oleaut32",
}
configuration { "vs*" }
links {
"SDL2",
- "Imm32",
- "Version",
+ "imm32",
+ "version",
}
configuration { }
else
@@ -74,8 +74,8 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "vs*" }
links {
"SDL2",
- "Imm32",
- "Version",
+ "imm32",
+ "version",
}
configuration { }
else
@@ -91,11 +91,11 @@ function maintargetosdoptions(_target,_subtarget)
libdirs {
path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
}
+ configuration { }
end
links {
"psapi",
}
- configuration {}
elseif _OPTIONS["targetos"]=="haiku" then
links {
"network",
@@ -107,7 +107,7 @@ function maintargetosdoptions(_target,_subtarget)
targetprefix "sdl"
links {
"psapi",
- "Ole32",
+ "ole32",
}
configuration { }
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 00432b75a8e..ecb3030c683 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -44,6 +44,7 @@ function maintargetosdoptions(_target,_subtarget)
"comdlg32",
"psapi",
"ole32",
+ "shlwapi",
}
end
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 4073f9c7336..564653f5a4a 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -499,6 +499,7 @@ links {
includedirs {
MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/netlist",
}
files {
@@ -543,6 +544,7 @@ links {
includedirs {
MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib/netlist",
}
files {
@@ -741,6 +743,7 @@ files {
MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp",
MAME_DIR .. "src/tools/imgtool/modules/hp9845_tape.cpp",
MAME_DIR .. "src/tools/imgtool/modules/hp85_tape.cpp",
+ MAME_DIR .. "src/tools/imgtool/modules/rt11.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -791,3 +794,98 @@ if _OPTIONS["targetos"] == "macosx" then
strip()
end
+
+--------------------------------------------------
+-- testkeys
+--------------------------------------------------
+
+if (_OPTIONS["osd"] == "sdl") then
+ project("testkeys")
+ uuid ("b3f5a5b8-3203-11e9-93e4-670b4f4e359d")
+ kind "ConsoleApp"
+
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+
+ links {
+ "ocore_" .. _OPTIONS["osd"],
+ ext_lib("utf8proc"),
+ }
+
+ if _OPTIONS["targetos"]=="windows" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ configuration { "mingw*"}
+ links {
+ "SDL2",
+ "imm32",
+ "version",
+ "ole32",
+ "oleaut32",
+ }
+ configuration { "vs*" }
+ links {
+ "SDL2",
+ "imm32",
+ "version",
+ }
+ configuration { }
+ else
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ configuration { "mingw*"}
+ links {
+ "SDL2main",
+ "SDL2",
+ }
+ configuration { "vs*" }
+ links {
+ "SDL2",
+ "imm32",
+ "version",
+ }
+ configuration { }
+ else
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
+ configuration { "x32", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
+ }
+ configuration { "x64", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
+ }
+ end
+ end
+
+ if BASE_TARGETOS=="unix" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ links {
+ "SDL2",
+ }
+ end
+ end
+
+ dofile("osd/sdl_cfg.lua")
+
+ includedirs {
+ MAME_DIR .. "src/osd",
+ }
+
+ files {
+ MAME_DIR .. "src/tools/testkeys.cpp",
+ }
+
+ configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+ configuration { }
+
+ strip()
+end
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index 6db6cd104e1..069c2fc802d 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -115,6 +115,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/crt9028.h,VIDEOS["CRT9028"] = true
+--------------------------------------------------
+
+if (VIDEOS["CRT9028"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/crt9028.cpp",
+ MAME_DIR .. "src/devices/video/crt9028.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/crt9212.h,VIDEOS["CRT9212"] = true
--------------------------------------------------
@@ -593,6 +605,18 @@ end
--------------------------------------------------
--
+--@src/devices/video/mm5445.h,VIDEOS["MM5445"] = true
+--------------------------------------------------
+
+if (VIDEOS["MM5445"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/mm5445.cpp",
+ MAME_DIR .. "src/devices/video/mm5445.h",
+ }
+end
+
+--------------------------------------------------
+--
--@src/devices/video/msm6222b.h,VIDEOS["MSM6222B"] = true
--------------------------------------------------
@@ -1148,3 +1172,15 @@ if (VIDEOS["PS2GS"]~=null) then
MAME_DIR .. "src/devices/video/ps2gs.h",
}
end
+
+--------------------------------------------------
+--
+--@src/devices/video/decsfb.h,VIDEOS["DECSFB"] = true
+--------------------------------------------------
+if (VIDEOS["DECSFB"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/video/decsfb.cpp",
+ MAME_DIR .. "src/devices/video/decsfb.h",
+ }
+end
+
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 597cd9a5755..4de0b3a2d72 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -133,6 +133,7 @@ CPUS["HMCS40"] = true
--CPUS["SM510"] = true
CPUS["ST62XX"] = true
CPUS["DSPP"] = true
+CPUS["HPC"] = true
--------------------------------------------------
-- specify available sound cores
@@ -285,6 +286,7 @@ VIDEOS["BUFSPRITE"] = true
VIDEOS["CESBLIT"] = true
--VIDEOS["CRT9007"] = true
--VIDEOS["CRT9021"] = true
+--VIDEOS["CRT9028"] = true
--VIDEOS["CRT9212"] = true
VIDEOS["CRTC_EGA"] = true
--VIDEOS["DL1416"] = true
@@ -321,6 +323,7 @@ VIDEOS["MB90082"] = true
VIDEOS["MB_VCU"] = true
VIDEOS["MC6845"] = true
--VIDEOS["MC6847"] = true
+--VIDEOS["MM5445"] = true
--VIDEOS["MSM6222B"] = true
--VIDEOS["MSM6255"] = true
--VIDEOS["MOS6566"] = true
@@ -528,7 +531,7 @@ MACHINES["MSM6242"] = true
MACHINES["MSM6253"] = true
--MACHINES["NCR5380"] = true
--MACHINES["NCR5380N"] = true
---MACHINES["NCR5390"] = true
+MACHINES["NCR5390"] = true
MACHINES["NCR539x"] = true
MACHINES["NETLIST"] = true
--MACHINES["NCR53C7XX"] = true
@@ -605,9 +608,9 @@ MACHINES["UPD765"] = true
MACHINES["FDC_PLL"] = true
MACHINES["V3021"] = true
MACHINES["WD_FDC"] = true
+--MACHINES["WD1010"] = true
MACHINES["WD11C00_17"] = true
MACHINES["WD2010"] = true
-MACHINES["WD33C93"] = true
MACHINES["WD33C9X"] = true
MACHINES["X2212"] = true
MACHINES["X76F041"] = true
@@ -652,6 +655,7 @@ MACHINES["PS2INTC"] = true
--MACHINES["IOPINTC"] = true
--MACHINES["IOPSIO2"] = true
--MACHINES["IOPTIMER"] = true
+MACHINES["AIC6250"] = true
--------------------------------------------------
-- specify available bus cores
@@ -677,7 +681,8 @@ BUSES["AMIGA_KEYBOARD"] = true
BUSES["CENTRONICS"] = true
--BUSES["CHANNELF"] = true
--BUSES["COCO"] = true
---BUSES["COLECO"] = true
+--BUSES["COLECO_CONTROLLER"] = true
+--BUSES["COLECO_CART"] = true
--BUSES["COMPUCOLOR"] = true
--BUSES["COMX35"] = true
--BUSES["CPC"] = true
@@ -742,6 +747,7 @@ BUSES["VECTREX"] = true
--BUSES["VIDBRAIN"] = true
--BUSES["VIP"] = true
--BUSES["VME"] = true
+--BUSES["VSMILE"] = true
--BUSES["VTECH_IOEXP"] = true
--BUSES["VTECH_MEMEXP"] = true
--BUSES["WANGPC"] = true
@@ -1194,6 +1200,8 @@ files {
MAME_DIR .. "src/mame/machine/nl_pongd.h",
MAME_DIR .. "src/mame/machine/nl_breakout.cpp",
MAME_DIR .. "src/mame/machine/nl_breakout.h",
+ MAME_DIR .. "src/mame/machine/nl_rebound.cpp",
+ MAME_DIR .. "src/mame/machine/nl_rebound.h",
MAME_DIR .. "src/mame/drivers/poolshrk.cpp",
MAME_DIR .. "src/mame/includes/poolshrk.h",
MAME_DIR .. "src/mame/audio/poolshrk.cpp",
@@ -4589,6 +4597,7 @@ files {
MAME_DIR .. "src/mame/drivers/coinmstr.cpp",
MAME_DIR .. "src/mame/drivers/coinmvga.cpp",
MAME_DIR .. "src/mame/drivers/comebaby.cpp",
+ MAME_DIR .. "src/mame/drivers/cromptons.cpp",
MAME_DIR .. "src/mame/drivers/cupidon.cpp",
MAME_DIR .. "src/mame/drivers/bntyhunt.cpp",
MAME_DIR .. "src/mame/drivers/coolpool.cpp",
@@ -4650,6 +4659,7 @@ files {
MAME_DIR .. "src/mame/drivers/freekick.cpp",
MAME_DIR .. "src/mame/includes/freekick.h",
MAME_DIR .. "src/mame/video/freekick.cpp",
+ MAME_DIR .. "src/mame/drivers/freeway.cpp",
MAME_DIR .. "src/mame/drivers/fungames.cpp",
MAME_DIR .. "src/mame/drivers/funkball.cpp",
MAME_DIR .. "src/mame/drivers/gambl186.cpp",
@@ -4744,6 +4754,7 @@ files {
MAME_DIR .. "src/mame/drivers/miniboy7.cpp",
MAME_DIR .. "src/mame/drivers/minivideo.cpp",
MAME_DIR .. "src/mame/drivers/mirax.cpp",
+ MAME_DIR .. "src/mame/drivers/missbamby.cpp",
MAME_DIR .. "src/mame/drivers/mjsenpu.cpp",
MAME_DIR .. "src/mame/drivers/mole.cpp",
MAME_DIR .. "src/mame/drivers/mosaic.cpp",
@@ -4861,6 +4872,7 @@ files {
MAME_DIR .. "src/mame/drivers/ice_tbd.cpp",
MAME_DIR .. "src/mame/drivers/umipoker.cpp",
MAME_DIR .. "src/mame/drivers/unkhorse.cpp",
+ MAME_DIR .. "src/mame/drivers/unkpoker.cpp",
MAME_DIR .. "src/mame/drivers/usbilliards.cpp",
MAME_DIR .. "src/mame/drivers/usgames.cpp",
MAME_DIR .. "src/mame/includes/usgames.h",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 71baa84e625..9d42bd1aa43 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -136,7 +136,11 @@ CPUS["MB86901"] = true
CPUS["NANOPROCESSOR"] = true
CPUS["CLIPPER"] = true
CPUS["CAPRICORN"] = true
+CPUS["ALPHA"] = true
+CPUS["NS32000"] = true
--CPUS["DSPP"] = true
+CPUS["HPC"] = true
+CPUS["MEG"] = true
--------------------------------------------------
-- specify available sound cores; some of these are
@@ -296,6 +300,7 @@ VIDEOS["CDP1862"] = true
--VIDEOS["CESBLIT"] = true
VIDEOS["CRT9007"] = true
VIDEOS["CRT9021"] = true
+VIDEOS["CRT9028"] = true
VIDEOS["CRT9212"] = true
VIDEOS["CRTC_EGA"] = true
VIDEOS["DL1416"] = true
@@ -306,9 +311,9 @@ VIDEOS["EF9345"] = true
VIDEOS["EF9364"] = true
VIDEOS["EF9365"] = true
--VIDEOS["EF9369"] = true
+VIDEOS["FIXFREQ"] = true
VIDEOS["GF4500"] = true
--VIDEOS["EPIC12"] = true
---VIDEOS["FIXFREQ"] = true
VIDEOS["NT7534"] = true
VIDEOS["HD44102"] = true
VIDEOS["HD44352"] = true
@@ -334,6 +339,7 @@ VIDEOS["IMS_CVC"] = true
--VIDEOS["MB_VCU"] = true
VIDEOS["MC6845"] = true
VIDEOS["MC6847"] = true
+VIDEOS["MM5445"] = true
VIDEOS["MSM6222B"] = true
VIDEOS["MSM6255"] = true
VIDEOS["MOS6566"] = true
@@ -374,6 +380,7 @@ VIDEOS["DP8510"] = true
VIDEOS["MB88303"] = true
VIDEOS["PS2GS"] = true
VIDEOS["PS2GIF"] = true
+VIDEOS["DECSFB"] = true
--------------------------------------------------
-- specify available machine cores
@@ -619,9 +626,9 @@ MACHINES["UPD765"] = true
MACHINES["FDC_PLL"] = true
MACHINES["V3021"] = true
MACHINES["WD_FDC"] = true
+MACHINES["WD1010"] = true
MACHINES["WD11C00_17"] = true
MACHINES["WD2010"] = true
-MACHINES["WD33C93"] = true
MACHINES["WD33C9X"] = true
MACHINES["WD7600"] = true
MACHINES["X2201"] = true
@@ -680,6 +687,8 @@ MACHINES["IOPTIMER"] = true
MACHINES["Z8038"] = true
MACHINES["AIC6250"] = true
MACHINES["DC7085"] = true
+MACHINES["I82357"] = true
+MACHINES["XC1700E"] = true
--------------------------------------------------
-- specify available bus cores
@@ -707,6 +716,7 @@ BUSES["BBC_JOYPORT"] = true
BUSES["BBC_1MHZBUS"] = true
BUSES["BBC_TUBE"] = true
BUSES["BBC_USERPORT"] = true
+BUSES["BBC_ROM"] = true
BUSES["BML3"] = true
BUSES["BW2"] = true
BUSES["C64"] = true
@@ -718,7 +728,8 @@ BUSES["CGENIE_EXPANSION"] = true
BUSES["CGENIE_PARALLEL"] = true
BUSES["CHANNELF"] = true
BUSES["COCO"] = true
-BUSES["COLECO"] = true
+BUSES["COLECO_CONTROLLER"] = true
+BUSES["COLECO_CART"] = true
BUSES["COMPIS_GRAPHICS"] = true
BUSES["COMPUCOLOR"] = true
BUSES["COMX35"] = true
@@ -752,6 +763,7 @@ BUSES["INTV_CTRL"] = true
BUSES["IQ151"] = true
BUSES["ISA"] = true
BUSES["ISBX"] = true
+BUSES["JAKKS_GAMEKEY"] = true
BUSES["HP_OPTROM"] = true
BUSES["HP80_OPTROM"] = true
BUSES["HP80_IO"] = true
@@ -763,6 +775,7 @@ BUSES["MACPDS"] = true
BUSES["MIDI"] = true
BUSES["MEGADRIVE"] = true
BUSES["MSX_SLOT"] = true
+BUSES["MTX"] = true
BUSES["NASBUS"] = true
BUSES["NEOGEO"] = true
BUSES["NEOGEO_CTRL"] = true
@@ -811,6 +824,7 @@ BUSES["TI99"] = true
BUSES["TI99X"] = true
BUSES["TIKI100"] = true
BUSES["TVC"] = true
+BUSES["UTS_KBD"] = true
BUSES["VBOY"] = true
BUSES["VC4000"] = true
BUSES["VCS"] = true
@@ -821,6 +835,7 @@ BUSES["VIC20"] = true
BUSES["VIDBRAIN"] = true
BUSES["VIP"] = true
BUSES["VME"] = true
+BUSES["VSMILE"] = true
BUSES["VTECH_IOEXP"] = true
BUSES["VTECH_MEMEXP"] = true
BUSES["WANGPC"] = true
@@ -853,6 +868,7 @@ FORMATS["APPLIX_DSK"] = true
FORMATS["APRIDISK"] = true
FORMATS["AP_DSK35"] = true
FORMATS["ASST128_DSK"] = true
+FORMATS["ASTROCADE_WAV"] = true
FORMATS["ATARI_DSK"] = true
FORMATS["ATOM_DSK"] = true
FORMATS["ATOM_TAP"] = true
@@ -922,12 +938,14 @@ FORMATS["MFM_HD"] = true
FORMATS["MM_DSK"] = true
FORMATS["MS0515_DSK"] = true
FORMATS["MSX_DSK"] = true
+FORMATS["MTX_DSK"] = true
FORMATS["MZ_CAS"] = true
FORMATS["NANOS_DSK"] = true
FORMATS["NASCOM_DSK"] = true
FORMATS["NASLITE_DSK"] = true
FORMATS["NES_DSK"] = true
FORMATS["NFD_DSK"] = true
+FORMATS["OPD_DSK"] = true
FORMATS["ORAO_CAS"] = true
FORMATS["ORIC_DSK"] = true
FORMATS["ORIC_TAP"] = true
@@ -1025,7 +1043,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"cccp",
"cce",
"ccs",
- "chessking",
+ "chess",
"chromatics",
"chrysler",
"coleco",
@@ -1034,7 +1052,6 @@ function linkProjects_mame_mess(_target, _subtarget)
"comx",
"concept",
"conitec",
- "cxg",
"cybiko",
"dai",
"ddr",
@@ -1057,7 +1074,6 @@ function linkProjects_mame_mess(_target, _subtarget)
"exidy",
"fairch",
"fairlight",
- "fidelity",
"force",
"fujitsu",
"funtech",
@@ -1089,6 +1105,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"kontron",
"kurzweil",
"kyocera",
+ "leapfrog",
"luxor",
"magnavox",
"makerbot",
@@ -1208,6 +1225,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"vtech",
"wang",
"wavemate",
+ "wyse",
"westinghouse",
"xerox",
"xussrpc",
@@ -1543,7 +1561,6 @@ files {
MAME_DIR .. "src/mame/drivers/apollo.cpp",
MAME_DIR .. "src/mame/includes/apollo.h",
MAME_DIR .. "src/mame/machine/apollo.cpp",
- MAME_DIR .. "src/mame/machine/apollo_dbg.cpp",
MAME_DIR .. "src/mame/machine/apollo_kbd.cpp",
MAME_DIR .. "src/mame/machine/apollo_kbd.h",
MAME_DIR .. "src/mame/video/apollo.cpp",
@@ -1559,6 +1576,8 @@ files {
MAME_DIR .. "src/mame/video/apple2.h",
MAME_DIR .. "src/mame/drivers/tk2000.cpp",
MAME_DIR .. "src/mame/drivers/apple2gs.cpp",
+ MAME_DIR .. "src/mame/machine/apple2common.cpp",
+ MAME_DIR .. "src/mame/machine/apple2common.h",
MAME_DIR .. "src/mame/drivers/apple3.cpp",
MAME_DIR .. "src/mame/includes/apple3.h",
MAME_DIR .. "src/mame/machine/apple3.cpp",
@@ -1824,9 +1843,44 @@ files {
MAME_DIR .. "src/mame/drivers/ccs300.cpp",
}
-createMESSProjects(_target, _subtarget, "chessking")
+createMESSProjects(_target, _subtarget, "chess")
files {
- MAME_DIR .. "src/mame/drivers/ckz80.cpp",
+ MAME_DIR .. "src/mame/machine/chessbase.cpp",
+ MAME_DIR .. "src/mame/includes/chessbase.h",
+ MAME_DIR .. "src/mame/drivers/ave_arb.cpp",
+ MAME_DIR .. "src/mame/drivers/cking_master.cpp",
+ MAME_DIR .. "src/mame/drivers/cxg_ch2001.cpp",
+
+ MAME_DIR .. "src/mame/machine/fidelbase.cpp",
+ MAME_DIR .. "src/mame/includes/fidelbase.h",
+ MAME_DIR .. "src/mame/drivers/fidel_as12.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_card.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_cc1.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_cc10.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_cc7.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_chesster.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_csc.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_dames.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_desdis.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_eag68k.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_elite.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_excel.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_phantom.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_sc12.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_sc6.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_sc8.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_sc9.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_vcc.cpp",
+ MAME_DIR .. "src/mame/drivers/fidel_vsc.cpp",
+
+ MAME_DIR .. "src/mame/machine/novagbase.cpp",
+ MAME_DIR .. "src/mame/includes/novagbase.h",
+ MAME_DIR .. "src/mame/drivers/novag_cforte.cpp",
+ MAME_DIR .. "src/mame/drivers/novag_delta1.cpp",
+ MAME_DIR .. "src/mame/drivers/novag_diablo.cpp",
+ MAME_DIR .. "src/mame/drivers/novag_presto.cpp",
+ MAME_DIR .. "src/mame/drivers/novag_scon.cpp",
+ MAME_DIR .. "src/mame/drivers/novag_sexpert.cpp",
}
createMESSProjects(_target, _subtarget, "chromatics")
@@ -1886,11 +1940,6 @@ files {
MAME_DIR .. "src/mame/machine/prof80mmu.h",
}
-createMESSProjects(_target, _subtarget, "cxg")
-files {
- MAME_DIR .. "src/mame/drivers/cxgz80.cpp",
-}
-
createMESSProjects(_target, _subtarget, "cybiko")
files {
MAME_DIR .. "src/mame/drivers/cybiko.cpp",
@@ -1944,6 +1993,8 @@ files {
MAME_DIR .. "src/mame/machine/decioga.h",
MAME_DIR .. "src/mame/drivers/dectalk.cpp",
MAME_DIR .. "src/mame/drivers/decwritr.cpp",
+ MAME_DIR .. "src/mame/drivers/jensen.cpp",
+ MAME_DIR .. "src/mame/includes/jensen.h",
MAME_DIR .. "src/mame/drivers/pdp11.cpp",
MAME_DIR .. "src/mame/drivers/vax11.cpp",
MAME_DIR .. "src/mame/drivers/rainbow.cpp",
@@ -2114,15 +2165,6 @@ files {
MAME_DIR .. "src/mame/audio/cmi01a.h",
}
-createMESSProjects(_target, _subtarget, "fidelity")
-files {
- MAME_DIR .. "src/mame/drivers/fidelz80.cpp",
- MAME_DIR .. "src/mame/includes/fidelbase.h",
- MAME_DIR .. "src/mame/drivers/fidel6502.cpp",
- MAME_DIR .. "src/mame/drivers/fidel68k.cpp",
- MAME_DIR .. "src/mame/drivers/fidelmcs48.cpp",
-}
-
createMESSProjects(_target, _subtarget, "force")
files {
MAME_DIR .. "src/mame/drivers/miniforce.cpp",
@@ -2232,6 +2274,7 @@ files {
MAME_DIR .. "src/mame/drivers/sbc6510.cpp",
MAME_DIR .. "src/mame/drivers/sitcom.cpp",
MAME_DIR .. "src/mame/drivers/slc1.cpp",
+ MAME_DIR .. "src/mame/drivers/slc1a.cpp",
MAME_DIR .. "src/mame/drivers/uzebox.cpp",
MAME_DIR .. "src/mame/drivers/z80dev.cpp",
}
@@ -2410,6 +2453,12 @@ files {
MAME_DIR .. "src/mame/video/kyocera.cpp",
}
+createMESSProjects(_target, _subtarget, "leapfrog")
+files {
+ MAME_DIR .. "src/mame/drivers/leapster.cpp",
+ MAME_DIR .. "src/mame/drivers/leapfrog_leappad.cpp",
+}
+
createMESSProjects(_target, _subtarget, "luxor")
files {
MAME_DIR .. "src/mame/drivers/abc80.cpp",
@@ -2706,11 +2755,6 @@ createMESSProjects(_target, _subtarget, "novag")
files {
MAME_DIR .. "src/mame/drivers/mk1.cpp",
MAME_DIR .. "src/mame/drivers/mk2.cpp",
- MAME_DIR .. "src/mame/drivers/novag6502.cpp",
- MAME_DIR .. "src/mame/includes/novagbase.h",
- MAME_DIR .. "src/mame/drivers/novag68k.cpp",
- MAME_DIR .. "src/mame/drivers/novagf8.cpp",
- MAME_DIR .. "src/mame/drivers/novagmcs48.cpp",
MAME_DIR .. "src/mame/drivers/ssystem3.cpp",
MAME_DIR .. "src/mame/includes/ssystem3.h",
MAME_DIR .. "src/mame/video/ssystem3.cpp",
@@ -2985,10 +3029,11 @@ files {
MAME_DIR .. "src/mame/drivers/mbc200.cpp",
MAME_DIR .. "src/mame/drivers/mbc55x.cpp",
MAME_DIR .. "src/mame/includes/mbc55x.h",
- MAME_DIR .. "src/mame/machine/mbc55x.cpp",
MAME_DIR .. "src/mame/video/mbc55x.cpp",
MAME_DIR .. "src/mame/drivers/phc25.cpp",
MAME_DIR .. "src/mame/includes/phc25.h",
+ MAME_DIR .. "src/mame/machine/mbc55x_kbd.cpp",
+ MAME_DIR .. "src/mame/machine/mbc55x_kbd.h",
}
-- Don't call this project "sega" or it collides with the arcade one
@@ -3009,6 +3054,7 @@ files {
MAME_DIR .. "src/mame/includes/megadriv_rad.h",
MAME_DIR .. "src/mame/drivers/segapico.cpp",
MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp",
+ MAME_DIR .. "src/mame/drivers/sega_beena.cpp",
MAME_DIR .. "src/mame/drivers/segapm.cpp",
MAME_DIR .. "src/mame/drivers/sg1000.cpp",
MAME_DIR .. "src/mame/includes/sg1000.h",
@@ -3051,6 +3097,8 @@ files {
MAME_DIR .. "src/mame/drivers/4dpi.cpp",
MAME_DIR .. "src/mame/drivers/indigo.cpp",
MAME_DIR .. "src/mame/drivers/indy_indigo2.cpp",
+ MAME_DIR .. "src/mame/video/light.cpp",
+ MAME_DIR .. "src/mame/video/light.h",
MAME_DIR .. "src/mame/video/newport.cpp",
MAME_DIR .. "src/mame/video/newport.h",
MAME_DIR .. "src/mame/video/crime.cpp",
@@ -3483,7 +3531,9 @@ files {
MAME_DIR .. "src/mame/audio/rad_eu3a05.h",
MAME_DIR .. "src/mame/machine/rad_eu3a05gpio.cpp",
MAME_DIR .. "src/mame/machine/rad_eu3a05gpio.h",
+ MAME_DIR .. "src/mame/drivers/trkfldch.cpp",
MAME_DIR .. "src/mame/drivers/tvgame.cpp",
+ MAME_DIR .. "src/mame/drivers/spg110.cpp",
MAME_DIR .. "src/mame/drivers/vii.cpp",
MAME_DIR .. "src/mame/drivers/xavix.cpp",
MAME_DIR .. "src/mame/video/xavix.cpp",
@@ -3494,6 +3544,18 @@ files {
MAME_DIR .. "src/mame/machine/xavix_mtrk_wheel.h",
MAME_DIR .. "src/mame/machine/xavix_madfb_ball.cpp",
MAME_DIR .. "src/mame/machine/xavix_madfb_ball.h",
+ MAME_DIR .. "src/mame/machine/xavix_io.cpp",
+ MAME_DIR .. "src/mame/machine/xavix_io.h",
+ MAME_DIR .. "src/mame/machine/xavix_adc.cpp",
+ MAME_DIR .. "src/mame/machine/xavix_adc.h",
+ MAME_DIR .. "src/mame/machine/xavix_anport.h",
+ MAME_DIR .. "src/mame/machine/xavix_anport.cpp",
+ MAME_DIR .. "src/mame/machine/xavix_math.h",
+ MAME_DIR .. "src/mame/machine/xavix_math.cpp",
+ MAME_DIR .. "src/mame/machine/xavix2002_io.cpp",
+ MAME_DIR .. "src/mame/machine/xavix2002_io.h",
+ MAME_DIR .. "src/mame/drivers/xavix2.cpp",
+ MAME_DIR .. "src/mame/drivers/titan_soc.cpp",
}
createMESSProjects(_target, _subtarget, "ultimachine")
@@ -3545,7 +3607,6 @@ files {
MAME_DIR .. "src/mame/drivers/mc8030.cpp",
MAME_DIR .. "src/mame/drivers/poly880.cpp",
MAME_DIR .. "src/mame/includes/poly880.h",
- MAME_DIR .. "src/mame/drivers/sc1.cpp",
MAME_DIR .. "src/mame/drivers/sc2.cpp",
}
@@ -3574,6 +3635,8 @@ createMESSProjects(_target, _subtarget, "visual")
files {
MAME_DIR .. "src/mame/drivers/v100.cpp",
MAME_DIR .. "src/mame/drivers/v102.cpp",
+ MAME_DIR .. "src/mame/machine/v102_kbd.cpp",
+ MAME_DIR .. "src/mame/machine/v102_kbd.h",
MAME_DIR .. "src/mame/drivers/v550.cpp",
MAME_DIR .. "src/mame/drivers/v1050.cpp",
MAME_DIR .. "src/mame/includes/v1050.h",
@@ -3592,6 +3655,7 @@ createMESSProjects(_target, _subtarget, "vtech")
files {
MAME_DIR .. "src/mame/drivers/crvision.cpp",
MAME_DIR .. "src/mame/includes/crvision.h",
+ MAME_DIR .. "src/mame/drivers/gamemachine.cpp",
MAME_DIR .. "src/mame/drivers/geniusiq.cpp",
MAME_DIR .. "src/mame/drivers/vtech_unk1.cpp",
MAME_DIR .. "src/mame/drivers/vtech_unk2.cpp",
@@ -3614,7 +3678,11 @@ files {
MAME_DIR .. "src/mame/audio/socrates.cpp",
MAME_DIR .. "src/mame/audio/socrates.h",
MAME_DIR .. "src/mame/drivers/inteladv.cpp",
+ MAME_DIR .. "src/mame/includes/vsmile.h",
MAME_DIR .. "src/mame/drivers/vsmile.cpp",
+ MAME_DIR .. "src/mame/drivers/vsmileb.cpp",
+ MAME_DIR .. "src/mame/drivers/clickstart.cpp",
+ MAME_DIR .. "src/mame/drivers/storio.cpp",
}
createMESSProjects(_target, _subtarget, "wang")
@@ -3638,6 +3706,19 @@ files {
MAME_DIR .. "src/mame/includes/jupiter.h",
}
+createMESSProjects(_target, _subtarget, "wyse")
+files {
+ MAME_DIR .. "src/mame/drivers/wy100.cpp",
+ MAME_DIR .. "src/mame/drivers/wy150.cpp",
+ MAME_DIR .. "src/mame/drivers/wy30p.cpp",
+ MAME_DIR .. "src/mame/drivers/wy50.cpp",
+ MAME_DIR .. "src/mame/drivers/wy55.cpp",
+ MAME_DIR .. "src/mame/drivers/wy60.cpp",
+ MAME_DIR .. "src/mame/drivers/wy85.cpp",
+ MAME_DIR .. "src/mame/machine/wy50kb.cpp",
+ MAME_DIR .. "src/mame/machine/wy50kb.h",
+}
+
createMESSProjects(_target, _subtarget, "xerox")
files {
MAME_DIR .. "src/mame/drivers/xerox820.cpp",
@@ -3691,6 +3772,11 @@ files {
MAME_DIR .. "src/mame/drivers/aaa.cpp",
MAME_DIR .. "src/mame/drivers/acd.cpp",
MAME_DIR .. "src/mame/drivers/aceex.cpp",
+ MAME_DIR .. "src/mame/drivers/aci_boris.cpp",
+ MAME_DIR .. "src/mame/drivers/aci_borisdpl.cpp",
+ MAME_DIR .. "src/mame/drivers/adm23.cpp",
+ MAME_DIR .. "src/mame/drivers/adm31.cpp",
+ MAME_DIR .. "src/mame/drivers/adm36.cpp",
MAME_DIR .. "src/mame/drivers/akaiax80.cpp",
MAME_DIR .. "src/mame/drivers/alcat7100.cpp",
MAME_DIR .. "src/mame/drivers/alesis_qs.cpp",
@@ -3710,6 +3796,7 @@ files {
MAME_DIR .. "src/mame/drivers/ax20.cpp",
MAME_DIR .. "src/mame/drivers/beehive.cpp",
MAME_DIR .. "src/mame/drivers/binbug.cpp",
+ MAME_DIR .. "src/mame/drivers/bert.cpp",
MAME_DIR .. "src/mame/drivers/besta.cpp",
MAME_DIR .. "src/mame/drivers/bitgraph.cpp",
MAME_DIR .. "src/mame/drivers/bpmmicro.cpp",
@@ -3718,6 +3805,7 @@ files {
MAME_DIR .. "src/mame/drivers/busicom.cpp",
MAME_DIR .. "src/mame/includes/busicom.h",
MAME_DIR .. "src/mame/video/busicom.cpp",
+ MAME_DIR .. "src/mame/drivers/c2color.cpp",
MAME_DIR .. "src/mame/drivers/candela.cpp",
MAME_DIR .. "src/mame/drivers/cardinal.cpp",
MAME_DIR .. "src/mame/drivers/chaos.cpp",
@@ -3794,6 +3882,7 @@ files {
MAME_DIR .. "src/mame/drivers/ikt5a.cpp",
MAME_DIR .. "src/mame/drivers/imsai.cpp",
MAME_DIR .. "src/mame/drivers/indiana.cpp",
+ MAME_DIR .. "src/mame/drivers/intellect02.cpp",
MAME_DIR .. "src/mame/drivers/is48x.cpp",
MAME_DIR .. "src/mame/drivers/itt1700.cpp",
MAME_DIR .. "src/mame/machine/itt1700_kbd.cpp",
@@ -3802,7 +3891,6 @@ files {
MAME_DIR .. "src/mame/drivers/jade.cpp",
MAME_DIR .. "src/mame/drivers/jonos.cpp",
MAME_DIR .. "src/mame/drivers/kron.cpp",
- MAME_DIR .. "src/mame/drivers/leapster.cpp",
MAME_DIR .. "src/mame/drivers/lee1214.cpp",
MAME_DIR .. "src/mame/drivers/learnwin.cpp",
MAME_DIR .. "src/mame/drivers/lft.cpp",
@@ -3816,6 +3904,7 @@ files {
MAME_DIR .. "src/mame/drivers/mice.cpp",
MAME_DIR .. "src/mame/drivers/micral.cpp",
MAME_DIR .. "src/mame/drivers/micro20.cpp",
+ MAME_DIR .. "src/mame/drivers/micromon.cpp",
MAME_DIR .. "src/mame/drivers/micronic.cpp",
MAME_DIR .. "src/mame/includes/micronic.h",
MAME_DIR .. "src/mame/drivers/microterm.cpp",
@@ -3908,10 +3997,6 @@ files {
MAME_DIR .. "src/mame/drivers/vp415.cpp",
MAME_DIR .. "src/mame/drivers/vsmilepro.cpp",
MAME_DIR .. "src/mame/drivers/wicat.cpp",
- MAME_DIR .. "src/mame/drivers/wy100.cpp",
- MAME_DIR .. "src/mame/drivers/wy50.cpp",
- MAME_DIR .. "src/mame/drivers/wy85.cpp",
- MAME_DIR .. "src/mame/drivers/wyse.cpp",
MAME_DIR .. "src/mame/drivers/xor100.cpp",
MAME_DIR .. "src/mame/includes/xor100.h",
MAME_DIR .. "src/mame/drivers/zms8085.cpp",
@@ -3920,6 +4005,11 @@ files {
MAME_DIR .. "src/mame/machine/zorbakbd.cpp",
MAME_DIR .. "src/mame/machine/zorbakbd.h",
MAME_DIR .. "src/mame/drivers/zt8802.cpp",
+ MAME_DIR .. "src/mame/drivers/testpat.cpp",
+ MAME_DIR .. "src/mame/machine/nl_tp1983.cpp",
+ MAME_DIR .. "src/mame/machine/nl_tp1985.cpp",
+ MAME_DIR .. "src/mame/drivers/palestra.cpp",
+ MAME_DIR .. "src/mame/machine/nl_palestra.cpp",
}
end
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index 226c80a3042..48375dfe2ca 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -29,6 +29,7 @@ CPUS["I8085"] = true
--CPUS["M680X0"] = true
--CPUS["TMS9900"] = true
--CPUS["COP400"] = true
+CPUS["F8"] = true
--------------------------------------------------
-- Specify all the sound cores necessary for the
@@ -47,7 +48,9 @@ SOUNDS["TMS5220"] = true
--SOUNDS["YM3812"] = true
--SOUNDS["CEM3394"] = true
--SOUNDS["VOTRAX"] = true
+SOUNDS["BEEP"] = true
SOUNDS["VOLT_REG"] = true
+SOUNDS["SPEAKER"] = true
--------------------------------------------------
-- specify available video cores
@@ -84,7 +87,7 @@ MACHINES["EEPROMDEV"] = true
--MACHINES["Z80CTC"] = true
--MACHINES["68681"] = true
--MACHINES["BANKDEV"] = true
-
+MACHINES["F3853"] = true
--------------------------------------------------
-- specify available bus cores
@@ -128,6 +131,8 @@ files{
MAME_DIR .. "src/mame/machine/nl_pongd.h",
MAME_DIR .. "src/mame/machine/nl_breakout.cpp",
MAME_DIR .. "src/mame/machine/nl_breakout.h",
+ MAME_DIR .. "src/mame/machine/nl_rebound.cpp",
+ MAME_DIR .. "src/mame/machine/nl_rebound.h",
MAME_DIR .. "src/mame/machine/nl_hazelvid.cpp",
MAME_DIR .. "src/mame/machine/nl_hazelvid.h",
@@ -147,6 +152,8 @@ files{
MAME_DIR .. "src/mame/includes/1942.h",
MAME_DIR .. "src/mame/video/1942.cpp",
+ MAME_DIR .. "src/mame/drivers/gamemachine.cpp",
+
MAME_DIR .. "src/mame/drivers/popeye.cpp",
MAME_DIR .. "src/mame/includes/popeye.h",
MAME_DIR .. "src/mame/video/popeye.cpp",