diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 10 | ||||
-rw-r--r-- | scripts/src/bus.lua | 129 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 80 | ||||
-rw-r--r-- | scripts/src/machine.lua | 144 | ||||
-rw-r--r-- | scripts/src/main.lua | 1 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 1 | ||||
-rw-r--r-- | scripts/src/sound.lua | 26 | ||||
-rw-r--r-- | scripts/src/video.lua | 36 |
9 files changed, 404 insertions, 27 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 7c1cc4acf4c..2ccfa749e19 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1198,6 +1198,7 @@ project "bimg" files { MAME_DIR .. "3rdparty/bimg/src/image.cpp", + MAME_DIR .. "3rdparty/bimg/src/image_gnf.cpp", } -------------------------------------------------- @@ -1324,12 +1325,10 @@ end files { MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp", MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/dxgi.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_egl.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_glx.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp", - MAME_DIR .. "3rdparty/bgfx/src/hmd.cpp", - MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp", - MAME_DIR .. "3rdparty/bgfx/src/hmd_openvr.cpp", MAME_DIR .. "3rdparty/bgfx/src/nvapi.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp", @@ -1347,8 +1346,9 @@ end MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp", - MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp", - MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui_draw.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui_widgets.cpp", } if _OPTIONS["targetos"]=="macosx" then files { diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 869a6d1b639..dc6bbd80a91 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -107,12 +107,12 @@ if (BUSES["ACORN"]~=null) then files { MAME_DIR .. "src/devices/bus/acorn/bus.cpp", MAME_DIR .. "src/devices/bus/acorn/bus.h", - MAME_DIR .. "src/devices/bus/acorn/atom/sid.cpp", - MAME_DIR .. "src/devices/bus/acorn/atom/sid.h", MAME_DIR .. "src/devices/bus/acorn/atom/discpack.cpp", MAME_DIR .. "src/devices/bus/acorn/atom/discpack.h", MAME_DIR .. "src/devices/bus/acorn/atom/econet.cpp", MAME_DIR .. "src/devices/bus/acorn/atom/econet.h", + MAME_DIR .. "src/devices/bus/acorn/atom/sid.cpp", + MAME_DIR .. "src/devices/bus/acorn/atom/sid.h", MAME_DIR .. "src/devices/bus/acorn/cms/4080term.cpp", MAME_DIR .. "src/devices/bus/acorn/cms/4080term.h", MAME_DIR .. "src/devices/bus/acorn/cms/fdc.cpp", @@ -273,10 +273,14 @@ if (BUSES["BBC_FDC"]~=null) then MAME_DIR .. "src/devices/bus/bbc/fdc/fdc.h", MAME_DIR .. "src/devices/bus/bbc/fdc/acorn.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/acorn.h", + MAME_DIR .. "src/devices/bus/bbc/fdc/ams.cpp", + MAME_DIR .. "src/devices/bus/bbc/fdc/ams.h", MAME_DIR .. "src/devices/bus/bbc/fdc/cumana.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/cumana.h", MAME_DIR .. "src/devices/bus/bbc/fdc/cv1797.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/cv1797.h", + MAME_DIR .. "src/devices/bus/bbc/fdc/microware.cpp", + MAME_DIR .. "src/devices/bus/bbc/fdc/microware.h", MAME_DIR .. "src/devices/bus/bbc/fdc/opus.cpp", MAME_DIR .. "src/devices/bus/bbc/fdc/opus.h", MAME_DIR .. "src/devices/bus/bbc/fdc/watford.cpp", @@ -294,6 +298,8 @@ if (BUSES["BBC_ANALOGUE"]~=null) then files { MAME_DIR .. "src/devices/bus/bbc/analogue/analogue.cpp", MAME_DIR .. "src/devices/bus/bbc/analogue/analogue.h", + MAME_DIR .. "src/devices/bus/bbc/analogue/bitstik.cpp", + MAME_DIR .. "src/devices/bus/bbc/analogue/bitstik.h", MAME_DIR .. "src/devices/bus/bbc/analogue/joystick.cpp", MAME_DIR .. "src/devices/bus/bbc/analogue/joystick.h", MAME_DIR .. "src/devices/bus/bbc/analogue/cfa3000a.cpp", @@ -304,6 +310,21 @@ end --------------------------------------------------- -- +--@src/devices/bus/bbc/exp/exp.h,BUSES["BBC_EXP"] = true +--------------------------------------------------- + +if (BUSES["BBC_EXP"]~=null) then + files { + MAME_DIR .. "src/devices/bus/bbc/exp/exp.cpp", + MAME_DIR .. "src/devices/bus/bbc/exp/exp.h", + MAME_DIR .. "src/devices/bus/bbc/exp/mertec.cpp", + MAME_DIR .. "src/devices/bus/bbc/exp/mertec.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/bbc/joyport/joyport.h,BUSES["BBC_JOYPORT"] = true --------------------------------------------------- @@ -328,6 +349,12 @@ if (BUSES["BBC_1MHZBUS"]~=null) then MAME_DIR .. "src/devices/bus/bbc/1mhzbus/1mhzbus.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebsid.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebsid.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/emrmidi.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/emrmidi.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ieee488.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ieee488.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp", @@ -347,8 +374,6 @@ if (BUSES["BBC_TUBE"]~=null) then MAME_DIR .. "src/devices/bus/bbc/tube/tube.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_65c102.cpp", - MAME_DIR .. "src/devices/bus/bbc/tube/tube_65c102.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_80186.cpp", MAME_DIR .. "src/devices/bus/bbc/tube/tube_80186.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_80286.cpp", @@ -357,6 +382,8 @@ if (BUSES["BBC_TUBE"]~=null) then MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_casper.cpp", MAME_DIR .. "src/devices/bus/bbc/tube/tube_casper.h", + MAME_DIR .. "src/devices/bus/bbc/tube/tube_rc6502.cpp", + MAME_DIR .. "src/devices/bus/bbc/tube/tube_rc6502.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_z80.cpp", MAME_DIR .. "src/devices/bus/bbc/tube/tube_z80.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_zep100.cpp", @@ -865,6 +892,10 @@ if (BUSES["HPHIL"]~=null) then MAME_DIR .. "src/devices/bus/hp_hil/hp_hil.h", MAME_DIR .. "src/devices/bus/hp_hil/hil_devices.cpp", MAME_DIR .. "src/devices/bus/hp_hil/hil_devices.h", + MAME_DIR .. "src/devices/bus/hp_hil/hlebase.cpp", + MAME_DIR .. "src/devices/bus/hp_hil/hlebase.h", + MAME_DIR .. "src/devices/bus/hp_hil/hlemouse.cpp", + MAME_DIR .. "src/devices/bus/hp_hil/hlemouse.h", MAME_DIR .. "src/devices/bus/hp_hil/hlekbd.cpp", MAME_DIR .. "src/devices/bus/hp_hil/hlekbd.h", } @@ -879,16 +910,26 @@ if (BUSES["HPDIO"]~=null) then files { MAME_DIR .. "src/devices/bus/hp_dio/hp_dio.cpp", MAME_DIR .. "src/devices/bus/hp_dio/hp_dio.h", + MAME_DIR .. "src/devices/bus/hp_dio/hp98265a.cpp", + MAME_DIR .. "src/devices/bus/hp_dio/hp98265a.h", MAME_DIR .. "src/devices/bus/hp_dio/hp98543.cpp", MAME_DIR .. "src/devices/bus/hp_dio/hp98543.h", MAME_DIR .. "src/devices/bus/hp_dio/hp98544.cpp", MAME_DIR .. "src/devices/bus/hp_dio/hp98544.h", + MAME_DIR .. "src/devices/bus/hp_dio/hp98550.cpp", + MAME_DIR .. "src/devices/bus/hp_dio/hp98550.h", MAME_DIR .. "src/devices/bus/hp_dio/hp98603a.cpp", MAME_DIR .. "src/devices/bus/hp_dio/hp98603a.h", MAME_DIR .. "src/devices/bus/hp_dio/hp98603b.cpp", MAME_DIR .. "src/devices/bus/hp_dio/hp98603b.h", + MAME_DIR .. "src/devices/bus/hp_dio/hp98620.cpp", + MAME_DIR .. "src/devices/bus/hp_dio/hp98620.h", + MAME_DIR .. "src/devices/bus/hp_dio/hp98643.cpp", + MAME_DIR .. "src/devices/bus/hp_dio/hp98643.h", MAME_DIR .. "src/devices/bus/hp_dio/hp98644.cpp", MAME_DIR .. "src/devices/bus/hp_dio/hp98644.h", + MAME_DIR .. "src/devices/bus/hp_dio/human_interface.cpp", + MAME_DIR .. "src/devices/bus/hp_dio/human_interface.h", } end @@ -962,6 +1003,14 @@ if (BUSES["IEEE488"]~=null) then MAME_DIR .. "src/devices/bus/ieee488/remote488.cpp", MAME_DIR .. "src/devices/bus/ieee488/remote488.h", } + + dependency { + { MAME_DIR .. "src/devices/bus/ieee488/hp9122c.cpp", GEN_DIR .. "emu/layout/hp9122c.lh" }, + } + + custombuildtask { + layoutbuildtask("emu/layout", "hp9122c"), + } end @@ -1369,6 +1418,8 @@ if (BUSES["PC_KBD"]~=null) then MAME_DIR .. "src/devices/bus/pc_kbd/pcat84.h", MAME_DIR .. "src/devices/bus/pc_kbd/pcxt83.cpp", MAME_DIR .. "src/devices/bus/pc_kbd/pcxt83.h", + MAME_DIR .. "src/devices/bus/pc_kbd/pcat101.cpp", + MAME_DIR .. "src/devices/bus/pc_kbd/pcat101.h", } end @@ -2022,8 +2073,8 @@ if (BUSES["RS232"]~=null) then MAME_DIR .. "src/devices/bus/rs232/rs232.h", MAME_DIR .. "src/devices/bus/rs232/pty.cpp", MAME_DIR .. "src/devices/bus/rs232/pty.h", - MAME_DIR .. "src/devices/bus/rs232/ser_mouse.cpp", - MAME_DIR .. "src/devices/bus/rs232/ser_mouse.h", + MAME_DIR .. "src/devices/bus/rs232/hlemouse.cpp", + MAME_DIR .. "src/devices/bus/rs232/hlemouse.h", MAME_DIR .. "src/devices/bus/rs232/sun_kbd.cpp", MAME_DIR .. "src/devices/bus/rs232/sun_kbd.h", MAME_DIR .. "src/devices/bus/rs232/terminal.cpp", @@ -2914,6 +2965,8 @@ if (BUSES["SCSI"]~=null) then MAME_DIR .. "src/devices/bus/scsi/scsihle.h", MAME_DIR .. "src/devices/bus/scsi/cdu76s.cpp", MAME_DIR .. "src/devices/bus/scsi/cdu76s.h", + MAME_DIR .. "src/devices/bus/scsi/scsicd512.cpp", + MAME_DIR .. "src/devices/bus/scsi/scsicd512.h", MAME_DIR .. "src/devices/bus/scsi/acb4070.cpp", MAME_DIR .. "src/devices/bus/scsi/acb4070.h", MAME_DIR .. "src/devices/bus/scsi/d9060hd.cpp", @@ -2986,8 +3039,10 @@ if (BUSES["AMIGA_KEYBOARD"]~=null) then MAME_DIR .. "src/devices/bus/amiga/keyboard/matrix.h", MAME_DIR .. "src/devices/bus/amiga/keyboard/a1200.cpp", MAME_DIR .. "src/devices/bus/amiga/keyboard/a1200.h", - MAME_DIR .. "src/devices/bus/amiga/keyboard/a500.cpp", - MAME_DIR .. "src/devices/bus/amiga/keyboard/a500.h", + MAME_DIR .. "src/devices/bus/amiga/keyboard/a2000.cpp", + MAME_DIR .. "src/devices/bus/amiga/keyboard/a2000.h", + MAME_DIR .. "src/devices/bus/amiga/keyboard/mitsumi.cpp", + MAME_DIR .. "src/devices/bus/amiga/keyboard/mitsumi.h", } end @@ -3004,6 +3059,10 @@ if (BUSES["ZORRO"]~=null) then MAME_DIR .. "src/devices/bus/amiga/zorro/cards.h", MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.cpp", MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.h", + MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.cpp", + MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.h", + MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.cpp", + MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.h", MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.cpp", MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.h", MAME_DIR .. "src/devices/bus/amiga/zorro/a590.cpp", @@ -3017,6 +3076,20 @@ end --------------------------------------------------- -- +--@src/devices/bus/sgikbd/sgikbd.h,BUSES["SGIKBD"] = true +--------------------------------------------------- + +if (BUSES["SGIKBD"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sgikbd/hlekbd.cpp", + MAME_DIR .. "src/devices/bus/sgikbd/hlekbd.h", + MAME_DIR .. "src/devices/bus/sgikbd/sgikbd.cpp", + MAME_DIR .. "src/devices/bus/sgikbd/sgikbd.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/sunkbd/sunkbd.h,BUSES["SUNKBD"] = true --------------------------------------------------- @@ -3031,6 +3104,44 @@ end --------------------------------------------------- -- +--@src/devices/bus/sunmouse/sunmouse.h,BUSES["SUNMOUSE"] = true +--------------------------------------------------- + +if (BUSES["SUNMOUSE"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sunmouse/hlemouse.cpp", + MAME_DIR .. "src/devices/bus/sunmouse/hlemouse.h", + MAME_DIR .. "src/devices/bus/sunmouse/sunmouse.cpp", + MAME_DIR .. "src/devices/bus/sunmouse/sunmouse.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/sbus/sbus.h,BUSES["SBUS"] = true +--------------------------------------------------- + +if (BUSES["SBUS"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sbus/artecon.cpp", + MAME_DIR .. "src/devices/bus/sbus/artecon.h", + MAME_DIR .. "src/devices/bus/sbus/bwtwo.cpp", + MAME_DIR .. "src/devices/bus/sbus/bwtwo.h", + MAME_DIR .. "src/devices/bus/sbus/cgsix.cpp", + MAME_DIR .. "src/devices/bus/sbus/cgsix.h", + MAME_DIR .. "src/devices/bus/sbus/cgthree.cpp", + MAME_DIR .. "src/devices/bus/sbus/cgthree.h", + MAME_DIR .. "src/devices/bus/sbus/hme.cpp", + MAME_DIR .. "src/devices/bus/sbus/hme.h", + MAME_DIR .. "src/devices/bus/sbus/sunpc.cpp", + MAME_DIR .. "src/devices/bus/sbus/sunpc.h", + MAME_DIR .. "src/devices/bus/sbus/sbus.cpp", + MAME_DIR .. "src/devices/bus/sbus/sbus.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/ql/exp.h,BUSES["QL"] = true --------------------------------------------------- @@ -3367,6 +3478,8 @@ if (BUSES["HP9845_IO"]~=null) then files { MAME_DIR .. "src/devices/bus/hp9845_io/hp9845_io.cpp", MAME_DIR .. "src/devices/bus/hp9845_io/hp9845_io.h", + MAME_DIR .. "src/devices/bus/hp9845_io/98032.cpp", + MAME_DIR .. "src/devices/bus/hp9845_io/98032.h", MAME_DIR .. "src/devices/bus/hp9845_io/98034.cpp", MAME_DIR .. "src/devices/bus/hp9845_io/98034.h", MAME_DIR .. "src/devices/bus/hp9845_io/98035.cpp", diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index a94c4c709a9..08fe95f7f68 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -13,7 +13,7 @@ -- Dynamic recompiler objects -------------------------------------------------- -DRC_CPUS = { "E1", "SH", "MIPS", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16" } +DRC_CPUS = { "E1", "SH", "MIPS3", "POWERPC", "RSP", "ARM7", "ADSP21062", "MB86235", "DSP16" } CPU_INCLUDE_DRC = false for i, v in ipairs(DRC_CPUS) do if (CPUS[v]~=null) then @@ -66,6 +66,26 @@ if (CPUS["8X300"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- +-- 3DO Don's Super Performing Processor (DSPP) +--@src/devices/cpu/dspp/dspp.h,CPUS["DSPP"] = true +-------------------------------------------------- + +if (CPUS["DSPP"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/dspp/dspp.cpp", + MAME_DIR .. "src/devices/cpu/dspp/dspp.h", + MAME_DIR .. "src/devices/cpu/dspp/dsppdrc.cpp", + MAME_DIR .. "src/devices/cpu/dspp/dsppfe.cpp", + MAME_DIR .. "src/devices/cpu/dspp/dsppfe.h", + } +end + +if (CPUS["DSPP"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dspp/dsppdasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dspp/dsppdasm.h") +end + +-------------------------------------------------- -- ARCangent A4 --@src/devices/cpu/arc/arc.h,CPUS["ARC"] = true -------------------------------------------------- @@ -599,6 +619,8 @@ if (CPUS["H8"]~=null) then MAME_DIR .. "src/devices/cpu/h8/h83337.h", MAME_DIR .. "src/devices/cpu/h8/h83002.cpp", MAME_DIR .. "src/devices/cpu/h8/h83002.h", + MAME_DIR .. "src/devices/cpu/h8/h83003.cpp", + MAME_DIR .. "src/devices/cpu/h8/h83003.h", MAME_DIR .. "src/devices/cpu/h8/h83006.cpp", MAME_DIR .. "src/devices/cpu/h8/h83006.h", MAME_DIR .. "src/devices/cpu/h8/h83008.cpp", @@ -747,6 +769,23 @@ if (CPUS["SH"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- +-- STmicro ST62xx +--@src/devices/cpu/st62xx/st62xx.h,CPUS["ST62XX"] = true +-------------------------------------------------- + +if (CPUS["ST62XX"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/st62xx/st62xx.cpp", + MAME_DIR .. "src/devices/cpu/st62xx/st62xx.h", + } +end + +if (CPUS["ST62XX"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/st62xx/st62xx_dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/st62xx/st62xx_dasm.h") +end + +-------------------------------------------------- -- HP Hybrid processor --@src/devices/cpu/hphybrid/hphybrid.h,CPUS["HPHYBRID"] = true -------------------------------------------------- @@ -969,12 +1008,16 @@ if (CPUS["MCS51"]~=null) then MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp", MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h", MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.hxx", + MAME_DIR .. "src/devices/cpu/mcs51/axc51-core.cpp", + MAME_DIR .. "src/devices/cpu/mcs51/axc51-core.h", } end if (CPUS["MCS51"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/axc51-core_dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/axc51-core_dasm.h") end -------------------------------------------------- @@ -1053,6 +1096,8 @@ if (CPUS["I386"]~=null) then MAME_DIR .. "src/devices/cpu/i386/i486ops.hxx", MAME_DIR .. "src/devices/cpu/i386/pentops.hxx", MAME_DIR .. "src/devices/cpu/i386/x87ops.hxx", + MAME_DIR .. "src/devices/cpu/i386/x87priv.h", + MAME_DIR .. "src/devices/cpu/i386/cpuidmsrs.hxx", } end @@ -1234,27 +1279,27 @@ end -------------------------------------------------- -- MIPS R3000 (MIPS I/II) series ---@src/devices/cpu/mips/r3000.h,CPUS["R3000"] = true +--@src/devices/cpu/mips/mips1.h,CPUS["MIPS1"] = true -------------------------------------------------- -if (CPUS["R3000"]~=null) then +if (CPUS["MIPS1"]~=null) then files { - MAME_DIR .. "src/devices/cpu/mips/r3000.cpp", - MAME_DIR .. "src/devices/cpu/mips/r3000.h", + MAME_DIR .. "src/devices/cpu/mips/mips1.cpp", + MAME_DIR .. "src/devices/cpu/mips/mips1.h", } end -if (CPUS["R3000"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.h") +if (CPUS["MIPS1"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips1dsm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips1dsm.h") end -------------------------------------------------- -- MIPS R4000 (MIPS III/IV) series ---@src/devices/cpu/mips/mips3.h,CPUS["MIPS"] = true +--@src/devices/cpu/mips/mips3.h,CPUS["MIPS3"] = true -------------------------------------------------- -if (CPUS["MIPS"]~=null) then +if (CPUS["MIPS3"]~=null) then files { MAME_DIR .. "src/devices/cpu/mips/mips3com.cpp", MAME_DIR .. "src/devices/cpu/mips/mips3com.h", @@ -1263,6 +1308,7 @@ if (CPUS["MIPS"]~=null) then MAME_DIR .. "src/devices/cpu/mips/mips3fe.cpp", MAME_DIR .. "src/devices/cpu/mips/mips3fe.h", MAME_DIR .. "src/devices/cpu/mips/mips3drc.cpp", + MAME_DIR .. "src/devices/cpu/mips/o2dprintf.hxx", MAME_DIR .. "src/devices/cpu/mips/ps2vu.cpp", MAME_DIR .. "src/devices/cpu/mips/ps2vu.h", MAME_DIR .. "src/devices/cpu/mips/ps2vif1.cpp", @@ -1270,7 +1316,7 @@ if (CPUS["MIPS"]~=null) then } end -if (CPUS["MIPS"]~=null or _OPTIONS["with-tools"]) then +if (CPUS["MIPS3"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips3dsm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips3dsm.h") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/vudasm.cpp") @@ -1360,6 +1406,7 @@ end --@src/devices/cpu/m6502/m65c02.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/r65c02.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/m65sc02.h,CPUS["M6502"] = true +--@src/devices/cpu/m6502/m6500_1.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/m6504.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/m6507.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/m6509.h,CPUS["M6502"] = true @@ -1390,6 +1437,8 @@ if (CPUS["M6502"]~=null) then MAME_DIR .. "src/devices/cpu/m6502/m65ce02.h", MAME_DIR .. "src/devices/cpu/m6502/m65sc02.cpp", MAME_DIR .. "src/devices/cpu/m6502/m65sc02.h", + MAME_DIR .. "src/devices/cpu/m6502/m6500_1.cpp", + MAME_DIR .. "src/devices/cpu/m6502/m6500_1.h", MAME_DIR .. "src/devices/cpu/m6502/m6504.cpp", MAME_DIR .. "src/devices/cpu/m6502/m6504.h", MAME_DIR .. "src/devices/cpu/m6502/m6507.cpp", @@ -1724,7 +1773,7 @@ end -- NEC V-series Intel-compatible --@src/devices/cpu/nec/nec.h,CPUS["NEC"] = true --@src/devices/cpu/nec/v25.h,CPUS["NEC"] = true ---@src/devices/cpu/nec/v53.h,CPUS["NEC"] = true +--@src/devices/cpu/nec/v5x.h,CPUS["NEC"] = true --@src/devices/cpu/v30mz/v30mz.h,CPUS["V30MZ"] = true -------------------------------------------------- @@ -1744,8 +1793,8 @@ if (CPUS["NEC"]~=null) then MAME_DIR .. "src/devices/cpu/nec/v25.cpp", MAME_DIR .. "src/devices/cpu/nec/v25.h", MAME_DIR .. "src/devices/cpu/nec/v25sfr.cpp", - MAME_DIR .. "src/devices/cpu/nec/v53.cpp", - MAME_DIR .. "src/devices/cpu/nec/v53.h", + MAME_DIR .. "src/devices/cpu/nec/v5x.cpp", + MAME_DIR .. "src/devices/cpu/nec/v5x.h", } end @@ -2340,11 +2389,13 @@ if (CPUS["TMS57002"]~=null) then files { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", MAME_DIR .. "src/devices/cpu/tms57002/tms57002.h", + MAME_DIR .. "src/devices/cpu/tms57002/tmsops.cpp", MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", } dependency { { MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" }, { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" }, + { MAME_DIR .. "src/devices/cpu/tms57002/tmsops.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" }, } custombuildtask { { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } } @@ -2689,6 +2740,7 @@ if (CPUS["MB86901"]~=null) then MAME_DIR .. "src/devices/cpu/sparc/mb86901.cpp", MAME_DIR .. "src/devices/cpu/sparc/sparcv8ops.ipp", MAME_DIR .. "src/devices/cpu/sparc/sparcdefs.h", + MAME_DIR .. "src/devices/cpu/sparc/sparc_intf.h", MAME_DIR .. "src/devices/cpu/sparc/sparc.h", } end diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 08f26d2ad5c..9433450b1b9 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -612,6 +612,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/am79c90.h,MACHINES["AM79C90"] = true +--------------------------------------------------- + +if (MACHINES["AM79C90"]~=null) then + files { + MAME_DIR .. "src/devices/machine/am79c90.cpp", + MAME_DIR .. "src/devices/machine/am79c90.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/am9513.h,MACHINES["AM9513"] = true --------------------------------------------------- @@ -1635,6 +1647,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/mb87030.h,MACHINES["MB87030"] = true +--------------------------------------------------- + +if (MACHINES["MB87030"]~=null) then + files { + MAME_DIR .. "src/devices/machine/mb87030.cpp", + MAME_DIR .. "src/devices/machine/mb87030.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/mb87078.h,MACHINES["MB87078"] = true --------------------------------------------------- @@ -2123,6 +2147,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/pcf8583.h,MACHINES["PCF8583"] = true +--------------------------------------------------- + +if (MACHINES["PCF8583"]~=null) then + files { + MAME_DIR .. "src/devices/machine/pcf8583.cpp", + MAME_DIR .. "src/devices/machine/pcf8583.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/pcf8593.h,MACHINES["PCF8593"] = true --------------------------------------------------- @@ -2531,6 +2567,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/sda2006.h,MACHINES["SDA2006"] = true +--------------------------------------------------- + +if (MACHINES["SDA2006"]~=null) then + files { + MAME_DIR .. "src/devices/machine/sda2006.cpp", + MAME_DIR .. "src/devices/machine/sda2006.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/smc91c9x.h,MACHINES["SMC91C9X"] = true --------------------------------------------------- @@ -2567,6 +2615,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/spg2xx.h,MACHINES["SPG2XX"] = true +--------------------------------------------------- + +if (MACHINES["SPG2XX"]~=null) then + files { + MAME_DIR .. "src/devices/machine/spg2xx.cpp", + MAME_DIR .. "src/devices/machine/spg2xx.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/stvcd.h,MACHINES["STVCD"] = true --------------------------------------------------- @@ -2901,6 +2961,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/x2201.h,MACHINES["X2201"] = true +--------------------------------------------------- + +if (MACHINES["X2201"]~=null) then + files { + MAME_DIR .. "src/devices/machine/x2201.cpp", + MAME_DIR .. "src/devices/machine/x2201.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/x2212.h,MACHINES["X2212"] = true --------------------------------------------------- @@ -3144,6 +3216,30 @@ end --------------------------------------------------- -- +--@src/devices/machine/dp83932c.h,MACHINES["DP83932C"] = true +--------------------------------------------------- + +if (MACHINES["DP83932C"]~=null) then + files { + MAME_DIR .. "src/devices/machine/dp83932c.cpp", + MAME_DIR .. "src/devices/machine/dp83932c.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/dp8573.h,MACHINES["DP8573"] = true +--------------------------------------------------- + +if (MACHINES["DP8573"]~=null) then + files { + MAME_DIR .. "src/devices/machine/dp8573.cpp", + MAME_DIR .. "src/devices/machine/dp8573.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/pc_lpt.h,MACHINES["PC_LPT"] = true --------------------------------------------------- @@ -3699,3 +3795,51 @@ if (MACHINES["IOPTIMER"]~=null) then MAME_DIR .. "src/devices/machine/ioptimer.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/sun4c_mmu.h,MACHINES["SUN4C_MMU"] = true +--------------------------------------------------- + +if (MACHINES["SUN4C_MMU"]~=null) then + files { + MAME_DIR .. "src/devices/machine/sun4c_mmu.cpp", + MAME_DIR .. "src/devices/machine/sun4c_mmu.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/z8038.h,MACHINES["Z8038"] = true +--------------------------------------------------- + +if (MACHINES["Z8038"]~=null) then + files { + MAME_DIR .. "src/devices/machine/z8038.cpp", + MAME_DIR .. "src/devices/machine/z8038.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/scc2698b.h,MACHINES["SCC2698B"] = true +--------------------------------------------------- + +if (MACHINES["SCC2698B"]~=null) then + files { + MAME_DIR .. "src/devices/machine/scc2698b.cpp", + MAME_DIR .. "src/devices/machine/scc2698b.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/aic6250.h,MACHINES["AIC6250"] = true +--------------------------------------------------- + +if (MACHINES["AIC6250"]~=null) then + files { + MAME_DIR .. "src/devices/machine/aic6250.cpp", + MAME_DIR .. "src/devices/machine/aic6250.h", + } +end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 65a80fb6c33..6c0d0866dd4 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -154,6 +154,7 @@ end .. " -s EXCEPTION_CATCHING_WHITELIST=\"['__ZN15running_machine17start_all_devicesEv','__ZN12cli_frontend7executeEiPPc','__ZN8chd_file11open_commonEb','__ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','__ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE']\"" .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__ZN15running_machine30emscripten_get_running_machineEv', '__ZN15running_machine17emscripten_get_uiEv', '__ZN15running_machine20emscripten_get_soundEv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio', '_SDL_SendKeyboardKey', '__ZN15running_machine15emscripten_saveEPKc', '__ZN15running_machine15emscripten_loadEPKc', '__ZN15running_machine21emscripten_hard_resetEv', '__ZN15running_machine21emscripten_soft_resetEv', '__ZN15running_machine15emscripten_exitEv']\"" .. " -s EXTRA_EXPORTED_RUNTIME_METHODS=\"['cwrap']\"" + .. " -s ERROR_ON_UNDEFINED_SYMBOLS=0" .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 6027b513de6..29eb931f916 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -114,6 +114,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_2102A.h", MAME_DIR .. "src/lib/netlist/devices/nld_2716.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_2716.h", + MAME_DIR .. "src/lib/netlist/devices/nld_tms4800.cpp", + MAME_DIR .. "src/lib/netlist/devices/nld_tms4800.h", MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_4020.h", MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp", @@ -182,6 +184,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_9322.h", MAME_DIR .. "src/lib/netlist/devices/nld_am2847.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_am2847.h", + MAME_DIR .. "src/lib/netlist/devices/nld_dm9314.cpp", + MAME_DIR .. "src/lib/netlist/devices/nld_dm9314.h", MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.h", MAME_DIR .. "src/lib/netlist/devices/nld_ne555.cpp", diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 73598da6760..2735e4df4f0 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -41,6 +41,7 @@ if not _OPTIONS["DONT_USE_NETWORK"] then defines { "USE_NETWORK", "OSD_NET_USE_PCAP", + "OSD_NET_USE_TAPTUN", } end diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index f8e7f0f20a1..f2d6c9b979d 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -382,6 +382,20 @@ end --------------------------------------------------- +-- Hudsonsoft HuC6230 SoundBox +--@src/devices/sound/huc6230.h,SOUNDS["HUC6230"] = true +--------------------------------------------------- + +if (SOUNDS["HUC6230"]~=null) then + files { + MAME_DIR .. "src/devices/sound/huc6230.cpp", + MAME_DIR .. "src/devices/sound/huc6230.h", + } +end + + + +--------------------------------------------------- -- Hudsonsoft C6280 sound chip --@src/devices/sound/c6280.h,SOUNDS["C6280"] = true --------------------------------------------------- @@ -1483,3 +1497,15 @@ if (SOUNDS["IOPSPU"]~=null) then MAME_DIR .. "src/devices/sound/iopspu.h", } end + +--------------------------------------------------- +-- +--@src/devices/sound/swp30.h,SOUNDS["SWP30"] = true +--------------------------------------------------- + +if (SOUNDS["SWP30"]~=null) then + files { + MAME_DIR .. "src/devices/sound/swp30.cpp", + MAME_DIR .. "src/devices/sound/swp30.h", + } +end diff --git a/scripts/src/video.lua b/scripts/src/video.lua index c014a026fad..6db6cd104e1 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -151,6 +151,18 @@ end -------------------------------------------------- -- +--@src/devices/video/dp8350.h,VIDEOS["DP8350"] = true +-------------------------------------------------- + +if (VIDEOS["DP8350"]~=null) then + files { + MAME_DIR .. "src/devices/video/dp8350.cpp", + MAME_DIR .. "src/devices/video/dp8350.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/ef9340_1.h,VIDEOS["EF9340_1"] = true -------------------------------------------------- @@ -497,6 +509,18 @@ end -------------------------------------------------- -- +--@src/devices/video/ims_cvc.h,VIDEOS["IMS_CVC"] = true +-------------------------------------------------- + +if (VIDEOS["IMS_CVC"]~=null) then + files { + MAME_DIR .. "src/devices/video/ims_cvc.cpp", + MAME_DIR .. "src/devices/video/ims_cvc.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/m50458.h,VIDEOS["M50458"] = true -------------------------------------------------- @@ -1082,6 +1106,18 @@ end -------------------------------------------------- -- +--@src/devices/video/catseye.h,VIDEOS["CATSEYE"] = true +-------------------------------------------------- +if (VIDEOS["CATSEYE"]~=null) then + files { + MAME_DIR .. "src/devices/video/catseye.cpp", + MAME_DIR .. "src/devices/video/catseye.h", + } +end + + +-------------------------------------------------- +-- --@src/devices/video/nereid.h,VIDEOS["NEREID"] = true -------------------------------------------------- if (VIDEOS["NEREID"]~=null) then |