diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /scripts/src | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (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/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 28 | ||||
-rw-r--r-- | scripts/src/bus.lua | 184 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 78 | ||||
-rw-r--r-- | scripts/src/formats.lua | 24 | ||||
-rw-r--r-- | scripts/src/machine.lua | 57 | ||||
-rw-r--r-- | scripts/src/main.lua | 8 | ||||
-rw-r--r-- | scripts/src/mame/frontend.lua | 1 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 12 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 20 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 1 | ||||
-rw-r--r-- | scripts/src/tools.lua | 98 | ||||
-rw-r--r-- | scripts/src/video.lua | 36 |
12 files changed, 499 insertions, 48 deletions
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 + |