diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 10 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 38 | ||||
-rw-r--r-- | scripts/src/bus.lua | 40 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 14 | ||||
-rw-r--r-- | scripts/src/formats.lua | 38 | ||||
-rw-r--r-- | scripts/src/machine.lua | 47 | ||||
-rw-r--r-- | scripts/src/main.lua | 1 | ||||
-rw-r--r-- | scripts/src/sound.lua | 141 | ||||
-rw-r--r-- | scripts/src/tools.lua | 6 | ||||
-rw-r--r-- | scripts/target/mame/arcade.lua | 17 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 63 | ||||
-rw-r--r-- | scripts/target/mame/virtual.lua | 3 |
12 files changed, 255 insertions, 163 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index b68ae191860..833cb6e3712 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1088,6 +1088,7 @@ end "-Wno-unknown-attributes", "-Wno-unknown-warning-option", "-Wno-unused-value", + "-Wno-unused-const-variable", } if (version < 70000) or ((version < 100001) and (_OPTIONS["targetos"] == 'macosx')) then buildoptions { -- clang 6.0 complains that [[maybe_unused]] is ignored for static data members @@ -1132,6 +1133,14 @@ end "-Wno-return-local-addr", -- sqlite3.c in GCC 10 } end + if (version >= 110000) then + buildoptions { + "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists + "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 + "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 + "-Wno-maybe-uninitialized" -- expat in GCC 11.1 + } + end end end @@ -1437,6 +1446,7 @@ if _OPTIONS["vs"]=="clangcl" then "-Wno-unused-local-typedef", "-Wno-unused-private-field", "-Wno-unused-variable", + "-Wno-xor-used-as-pow", "-Wno-microsoft-cast", } end diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 2056e2e95a5..f7aa6280533 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -2255,6 +2255,44 @@ project "wdlfft" -------------------------------------------------- +-- ymfm library objects +-------------------------------------------------- + +project "ymfm" + uuid "2403a536-cb0a-4b50-b41f-10c17917689b" + kind "StaticLib" + + configuration { } + defines { + "YMFM_MAME", + } + + files { + MAME_DIR .. "3rdparty/ymfm/src/ymfm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_adpcm.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_adpcm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_fm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_fm.ipp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_misc.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_misc.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opl.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opl.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opm.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opn.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opn.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opq.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opq.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opz.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opz.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_pcm.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_pcm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_ssg.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_ssg.h", + } + + +-------------------------------------------------- -- asmjit library -------------------------------------------------- diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index d98d0b90b48..fd54182bc0a 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -201,6 +201,10 @@ if (BUSES["ADB"]~=null) then MAME_DIR .. "src/devices/bus/adb/adb.h", MAME_DIR .. "src/devices/bus/adb/adbhle.cpp", MAME_DIR .. "src/devices/bus/adb/adbhle.h", + MAME_DIR .. "src/devices/bus/adb/a9m0330.cpp", + MAME_DIR .. "src/devices/bus/adb/a9m0330.h", + MAME_DIR .. "src/devices/bus/adb/a9m0331.cpp", + MAME_DIR .. "src/devices/bus/adb/a9m0331.h", } end @@ -618,6 +622,8 @@ if (BUSES["BBC_TUBE"]~=null) then MAME_DIR .. "src/devices/bus/bbc/tube/tube_a500.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm.cpp", MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm.h", + MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm7.cpp", + MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm7.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_cms6809.cpp", @@ -2416,6 +2422,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/agat7ram.h", MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.cpp", MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.h", + MAME_DIR .. "src/devices/bus/a2bus/booti.cpp", + MAME_DIR .. "src/devices/bus/a2bus/booti.h", MAME_DIR .. "src/devices/bus/a2bus/byte8251.cpp", MAME_DIR .. "src/devices/bus/a2bus/byte8251.h", MAME_DIR .. "src/devices/bus/a2bus/ccs7710.cpp", @@ -2509,6 +2517,8 @@ if (BUSES["NSCSI"]~=null) then MAME_DIR .. "src/devices/bus/nscsi/cdu415.h", MAME_DIR .. "src/devices/bus/nscsi/cdu561.cpp", MAME_DIR .. "src/devices/bus/nscsi/cdu561.h", + MAME_DIR .. "src/devices/bus/nscsi/crd254sh.cpp", + MAME_DIR .. "src/devices/bus/nscsi/crd254sh.h", MAME_DIR .. "src/devices/bus/nscsi/cw7501.cpp", MAME_DIR .. "src/devices/bus/nscsi/cw7501.h", MAME_DIR .. "src/devices/bus/nscsi/devices.cpp", @@ -3445,6 +3455,8 @@ if (BUSES["COCO"]~=null) then MAME_DIR .. "src/devices/bus/coco/coco_fdc.h", MAME_DIR .. "src/devices/bus/coco/coco_gmc.cpp", MAME_DIR .. "src/devices/bus/coco/coco_gmc.h", + MAME_DIR .. "src/devices/bus/coco/coco_max.cpp", + MAME_DIR .. "src/devices/bus/coco/coco_max.h", MAME_DIR .. "src/devices/bus/coco/coco_midi.cpp", MAME_DIR .. "src/devices/bus/coco/coco_midi.h", MAME_DIR .. "src/devices/bus/coco/coco_multi.cpp", @@ -3827,6 +3839,8 @@ end if (BUSES["QBUS"]~=null) then files { + MAME_DIR .. "src/devices/bus/qbus/dsd4432.cpp", + MAME_DIR .. "src/devices/bus/qbus/dsd4432.h", MAME_DIR .. "src/devices/bus/qbus/pc11.cpp", MAME_DIR .. "src/devices/bus/qbus/pc11.h", MAME_DIR .. "src/devices/bus/qbus/qbus.cpp", @@ -3972,6 +3986,8 @@ if (BUSES["VSMILE"]~=null) then MAME_DIR .. "src/devices/bus/vsmile/pad.h", MAME_DIR .. "src/devices/bus/vsmile/mat.cpp", MAME_DIR .. "src/devices/bus/vsmile/mat.h", + MAME_DIR .. "src/devices/bus/vsmile/keyboard.cpp", + MAME_DIR .. "src/devices/bus/vsmile/keyboard.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", @@ -3998,6 +4014,8 @@ if (BUSES["VTECH_MEMEXP"]~=null) then MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.h", MAME_DIR .. "src/devices/bus/vtech/memexp/rtty.cpp", MAME_DIR .. "src/devices/bus/vtech/memexp/rtty.h", + MAME_DIR .. "src/devices/bus/vtech/memexp/sdloader.cpp", + MAME_DIR .. "src/devices/bus/vtech/memexp/sdloader.h", MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.cpp", MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.h", } @@ -4014,6 +4032,8 @@ if (BUSES["VTECH_IOEXP"]~=null) then MAME_DIR .. "src/devices/bus/vtech/ioexp/ioexp.h", MAME_DIR .. "src/devices/bus/vtech/ioexp/carts.cpp", MAME_DIR .. "src/devices/bus/vtech/ioexp/carts.h", + MAME_DIR .. "src/devices/bus/vtech/ioexp/lpen.cpp", + MAME_DIR .. "src/devices/bus/vtech/ioexp/lpen.h", MAME_DIR .. "src/devices/bus/vtech/ioexp/joystick.cpp", MAME_DIR .. "src/devices/bus/vtech/ioexp/joystick.h", MAME_DIR .. "src/devices/bus/vtech/ioexp/printer.cpp", @@ -4438,6 +4458,26 @@ end --------------------------------------------------- -- +--@src/devices/bus/saitek_osa/expansion.h,BUSES["SAITEK_OSA"] = true +--------------------------------------------------- + +if (BUSES["SAITEK_OSA"]~=null) then + files { + MAME_DIR .. "src/devices/bus/saitek_osa/expansion.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/expansion.h", + MAME_DIR .. "src/devices/bus/saitek_osa/modules.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/modules.h", + MAME_DIR .. "src/devices/bus/saitek_osa/maestro.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/maestro.h", + MAME_DIR .. "src/devices/bus/saitek_osa/maestroa.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/maestroa.h", + MAME_DIR .. "src/devices/bus/saitek_osa/sparc.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/sparc.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/samcoupe/drive/drive.h,BUSES["SAMCOUPE_DRIVE_PORT"] = true --------------------------------------------------- diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 8564d702a6d..fa655d8b60b 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -555,6 +555,8 @@ end if CPUS["PDP8"] then files { + MAME_DIR .. "src/devices/cpu/pdp8/hd6120.cpp", + MAME_DIR .. "src/devices/cpu/pdp8/hd6120.h", MAME_DIR .. "src/devices/cpu/pdp8/pdp8.cpp", MAME_DIR .. "src/devices/cpu/pdp8/pdp8.h", } @@ -668,6 +670,8 @@ if CPUS["H8"] then MAME_DIR .. "src/devices/cpu/h8/h83008.h", MAME_DIR .. "src/devices/cpu/h8/h83032.cpp", MAME_DIR .. "src/devices/cpu/h8/h83032.h", + MAME_DIR .. "src/devices/cpu/h8/h83042.cpp", + MAME_DIR .. "src/devices/cpu/h8/h83042.h", MAME_DIR .. "src/devices/cpu/h8/h83048.cpp", MAME_DIR .. "src/devices/cpu/h8/h83048.h", MAME_DIR .. "src/devices/cpu/h8/h8s2245.cpp", @@ -3519,3 +3523,13 @@ if opt_tool(CPUS, "MK1") then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mk1/mk1dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mk1/mk1dasm.h") end + +-------------------------------------------------- +-- Motorola M68HC16 (CPU16) - Disassembler only +--@src/devices/cpu/m68hc16/m68hc16.h,CPUS["M68HC16"] = true +-------------------------------------------------- + +if opt_tool(CPUS, "M68HC16") then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m68hc16/cpu16dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m68hc16/cpu16dasm.h") +end diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index 2e54bfaa999..5afef69d522 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -50,6 +50,8 @@ project "formats" MAME_DIR .. "src/lib/formats/cqm_dsk.h", MAME_DIR .. "src/lib/formats/dsk_dsk.cpp", MAME_DIR .. "src/lib/formats/dsk_dsk.h", + MAME_DIR .. "src/lib/formats/ipf_dsk.cpp", + MAME_DIR .. "src/lib/formats/ipf_dsk.h", MAME_DIR .. "src/lib/formats/td0_dsk.cpp", MAME_DIR .. "src/lib/formats/td0_dsk.h", MAME_DIR .. "src/lib/formats/hxchfe_dsk.cpp", @@ -1497,18 +1499,6 @@ end -------------------------------------------------- -- ---@src/lib/formats/ipf_dsk.h,FORMATS["IPF_DSK"] = true --------------------------------------------------- - -if opt_tool(FORMATS, "IPF_DSK") then - files { - MAME_DIR.. "src/lib/formats/ipf_dsk.cpp", - MAME_DIR.. "src/lib/formats/ipf_dsk.h", - } -end - --------------------------------------------------- --- --@src/lib/formats/phc25_cas.h,FORMATS["PHC25_CAS"] = true -------------------------------------------------- @@ -2001,6 +1991,30 @@ end -------------------------------------------------- -- +--@src/lib/formats/vt_dsk.h,FORMATS["VT_DSK"] = true +-------------------------------------------------- + +if opt_tool(FORMATS, "VT_DSK") then + files { + MAME_DIR.. "src/lib/formats/vt_dsk.cpp", + MAME_DIR.. "src/lib/formats/vt_dsk.h", + } +end + +-------------------------------------------------- +-- +--@src/lib/formats/fs_vtech.h,FORMATS["FS_VTECH"] = true +-------------------------------------------------- + +if opt_tool(FORMATS, "FS_VTECH") then + files { + MAME_DIR.. "src/lib/formats/fs_vtech.cpp", + MAME_DIR.. "src/lib/formats/fs_vtech.h", + } +end + +-------------------------------------------------- +-- --@src/lib/formats/wd177x_dsk.h,FORMATS["WD177X_DSK"] = true -------------------------------------------------- diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index b6bb6d7aec8..ff8fb333b39 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -634,18 +634,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/aakart.h,MACHINES["AAKARTDEV"] = true ---------------------------------------------------- - -if (MACHINES["AAKARTDEV"]~=null) then - files { - MAME_DIR .. "src/devices/machine/aakart.cpp", - MAME_DIR .. "src/devices/machine/aakart.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/adc0804.h,MACHINES["ADC0804"] = true --------------------------------------------------- @@ -850,6 +838,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/at28c64b.h,MACHINES["AT28C64B"] = true +--------------------------------------------------- + +if (MACHINES["AT28C64B"]~=null) then + files { + MAME_DIR .. "src/devices/machine/at28c64b.cpp", + MAME_DIR .. "src/devices/machine/at28c64b.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/at29x.h,MACHINES["AT29X"] = true --------------------------------------------------- @@ -993,6 +993,17 @@ if (MACHINES["CDP1879"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/ch376.h,MACHINES["CH376"] = true +--------------------------------------------------- + +if (MACHINES["CH376"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ch376.cpp", + MAME_DIR .. "src/devices/machine/ch376.h", + } +end --------------------------------------------------- -- @@ -3779,18 +3790,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/ncr5380.h,MACHINES["NCR5380"] = true ---------------------------------------------------- - -if (MACHINES["NCR5380"]~=null) then - files { - MAME_DIR .. "src/devices/machine/ncr5380.cpp", - MAME_DIR .. "src/devices/machine/ncr5380.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/ncr5380n.h,MACHINES["NCR5380N"] = true --------------------------------------------------- diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 256a99c690f..992f883f3c8 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -250,6 +250,7 @@ end "softfloat", "softfloat3", "wdlfft", + "ymfm", ext_lib("jpeg"), "7z", } diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index 1d643268548..f9710d96547 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -10,12 +10,16 @@ ---------------------------------------------------------------------------- files { + MAME_DIR .. "src/devices/sound/bbd.cpp", + MAME_DIR .. "src/devices/sound/bbd.h", MAME_DIR .. "src/devices/sound/flt_biquad.cpp", MAME_DIR .. "src/devices/sound/flt_biquad.h", MAME_DIR .. "src/devices/sound/flt_vol.cpp", MAME_DIR .. "src/devices/sound/flt_vol.h", MAME_DIR .. "src/devices/sound/flt_rc.cpp", MAME_DIR .. "src/devices/sound/flt_rc.h", + MAME_DIR .. "src/devices/sound/mixer.cpp", + MAME_DIR .. "src/devices/sound/mixer.h", MAME_DIR .. "src/devices/sound/samples.cpp", MAME_DIR .. "src/devices/sound/samples.h", } @@ -1169,124 +1173,64 @@ end --------------------------------------------------- -- Yamaha FM synthesizers ---@src/devices/sound/ym2151.h,SOUNDS["YM2151"] = true ---@src/devices/sound/ym2203.h,SOUNDS["YM2203"] = true ---@src/devices/sound/ym2413.h,SOUNDS["YM2413"] = true ---@src/devices/sound/ym2608.h,SOUNDS["YM2608"] = true ---@src/devices/sound/ym2610.h,SOUNDS["YM2610"] = true ---@src/devices/sound/ym2612.h,SOUNDS["YM2612"] = true ---@src/devices/sound/ym3526.h,SOUNDS["YM3526"] = true ---@src/devices/sound/ym3812.h,SOUNDS["YM3812"] = true ---@src/devices/sound/ymf262.h,SOUNDS["YMF262"] = true +--@src/devices/sound/ym2154.h,SOUNDS["YM2154"] = true +--@src/devices/sound/ymopm.h,SOUNDS["YM2151"] = true +--@src/devices/sound/ymopz.h,SOUNDS["YM2414"] = true +--@src/devices/sound/ymopq.h,SOUNDS["YM3806"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2203"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YM2413"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2608"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2610"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2612"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YM3526"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YM3812"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YMF262"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YMF278B"] = true --@src/devices/sound/ymf271.h,SOUNDS["YMF271"] = true ---@src/devices/sound/ymf278b.h,SOUNDS["YMF278B"] = true ---@src/devices/sound/y8950.h,SOUNDS["Y8950"] = true +--@src/devices/sound/ymopl.h,SOUNDS["Y8950"] = true --------------------------------------------------- -if (SOUNDS["YM2151"]~=null) then +if (SOUNDS["YM2154"]~=null) then files { - MAME_DIR .. "src/devices/sound/ym2151.cpp", - MAME_DIR .. "src/devices/sound/ym2151.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ym2154.cpp", + MAME_DIR .. "src/devices/sound/ym2154.h", } end -if (SOUNDS["YM2413"]~=null or SOUNDS["YM2423"]~=null or SOUNDS["YMF281"]~=null or SOUNDS["DS1001"]~=null) then +if (SOUNDS["YM2151"]~=null or SOUNDS["YM2164"]~=null) then files { - MAME_DIR .. "src/devices/sound/ym2413.cpp", - MAME_DIR .. "src/devices/sound/ym2413.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopm.cpp", + MAME_DIR .. "src/devices/sound/ymopm.h", } end -if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then ---if (SOUNDS["YM2203"]~=null) then +if (SOUNDS["YM2414"]~=null) then files { - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/ym2203.cpp", - MAME_DIR .. "src/devices/sound/ym2203.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopz.cpp", + MAME_DIR .. "src/devices/sound/ymopz.h", } ---end - +end ---if (SOUNDS["YM2608"]~=null) then +if (SOUNDS["YM3806"]~=null) then files { - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/ym2608.cpp", - MAME_DIR .. "src/devices/sound/ym2608.h", - MAME_DIR .. "src/devices/sound/ymadpcm.cpp", - MAME_DIR .. "src/devices/sound/ymadpcm.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopq.cpp", + MAME_DIR .. "src/devices/sound/ymopq.h", } ---end +end ---if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then +if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then files { MAME_DIR .. "src/devices/sound/ay8910.cpp", MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/ym2610.cpp", - MAME_DIR .. "src/devices/sound/ym2610.h", - MAME_DIR .. "src/devices/sound/ymadpcm.cpp", - MAME_DIR .. "src/devices/sound/ymadpcm.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end - ---if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ym2612.cpp", - MAME_DIR .. "src/devices/sound/ym2612.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end -end - -if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then ---if (SOUNDS["YM3812"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ym3812.cpp", - MAME_DIR .. "src/devices/sound/ym3812.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopn.cpp", + MAME_DIR .. "src/devices/sound/ymopn.h", } ---end - ---if (SOUNDS["YM3526"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ym3526.cpp", - MAME_DIR .. "src/devices/sound/ym3526.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end - ---if (SOUNDS["Y8950"]~=null) then - files { - MAME_DIR .. "src/devices/sound/y8950.cpp", - MAME_DIR .. "src/devices/sound/y8950.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - MAME_DIR .. "src/devices/sound/ymadpcm.cpp", - MAME_DIR .. "src/devices/sound/ymadpcm.h", - } ---end end -if (SOUNDS["YMF262"]~=null) then +if (SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null or SOUNDS["YM3812"]~=null or SOUNDS["YMF262"]~=null or SOUNDS["YMF278B"]~=null or SOUNDS["YM2413"]~=null or SOUNDS["YM2423"]~=null or SOUNDS["YMF281"]~=null or SOUNDS["DS1001"]~=null) then files { - MAME_DIR .. "src/devices/sound/ymf262.cpp", - MAME_DIR .. "src/devices/sound/ymf262.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopl.cpp", + MAME_DIR .. "src/devices/sound/ymopl.h", } end @@ -1297,15 +1241,6 @@ if (SOUNDS["YMF271"]~=null) then } end -if (SOUNDS["YMF278B"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ymf278b.cpp", - MAME_DIR .. "src/devices/sound/ymf278b.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } -end - --------------------------------------------------- diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index b3fb64c30c0..999ff594407 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -609,6 +609,8 @@ includedirs { } files { + MAME_DIR .. "src/tools/image_handler.cpp", + MAME_DIR .. "src/tools/image_handler.h", MAME_DIR .. "src/tools/floptool.cpp", } @@ -677,8 +679,8 @@ files { MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.cpp", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp", diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 4565f6472e7..3535c5dfbeb 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -441,7 +441,6 @@ MACHINES["TTL74259"] = true MACHINES["TTL7474"] = true MACHINES["KBDC8042"] = true MACHINES["I8257"] = true -MACHINES["AAKARTDEV"] = true --MACHINES["ACIA6850"] = true MACHINES["ADC0804"] = true MACHINES["ADC0808"] = true @@ -459,6 +458,7 @@ MACHINES["AM9517A"] = true MACHINES["AMIGAFDC"] = true MACHINES["AT_KEYBC"] = true MACHINES["AT28C16"] = true +--MACHINES["AT28C64B"] = true MACHINES["AT29X"] = true MACHINES["AT45DBXX"] = true MACHINES["ATAFLASH"] = true @@ -468,6 +468,7 @@ MACHINES["BANKDEV"] = true --MACHINES["BIM68153"] = true MACHINES["CDP1852"] = true MACHINES["CDP1871"] = true +--MACHINES["CH376"] = true MACHINES["CHESSMACHINE"] = true MACHINES["CMOS40105"] = true MACHINES["CDU76S"] = true @@ -588,7 +589,6 @@ MACHINES["MSM5832"] = true MACHINES["MSM58321"] = true MACHINES["MSM6242"] = true MACHINES["MSM6253"] = true ---MACHINES["NCR5380"] = true MACHINES["NCR5380N"] = true MACHINES["NCR5390"] = true MACHINES["NCR539x"] = true @@ -1045,8 +1045,6 @@ files { MAME_DIR .. "src/mame/drivers/ertictac.cpp", MAME_DIR .. "src/mame/drivers/ssfindo.cpp", MAME_DIR .. "src/mame/drivers/aristmk5.cpp", - MAME_DIR .. "src/mame/machine/archimds.cpp", - MAME_DIR .. "src/mame/includes/archimds.h", } createMAMEProjects(_target, _subtarget, "adp") @@ -1570,6 +1568,7 @@ files { MAME_DIR .. "src/mame/drivers/mitchell.cpp", MAME_DIR .. "src/mame/includes/mitchell.h", MAME_DIR .. "src/mame/video/mitchell.cpp", + MAME_DIR .. "src/mame/drivers/psrockman.cpp", MAME_DIR .. "src/mame/drivers/sf.cpp", MAME_DIR .. "src/mame/drivers/sidearms.cpp", MAME_DIR .. "src/mame/includes/sidearms.h", @@ -2511,6 +2510,8 @@ files { MAME_DIR .. "src/mame/drivers/hornet.cpp", MAME_DIR .. "src/mame/machine/konppc.cpp", MAME_DIR .. "src/mame/machine/konppc.h", + MAME_DIR .. "src/mame/machine/konami_gn676_lan.cpp", + MAME_DIR .. "src/mame/machine/konami_gn676_lan.h", MAME_DIR .. "src/mame/drivers/hyperspt.cpp", MAME_DIR .. "src/mame/includes/hyperspt.h", MAME_DIR .. "src/mame/audio/hyprolyb.cpp", @@ -2553,6 +2554,8 @@ files { MAME_DIR .. "src/mame/machine/k573dio.h", MAME_DIR .. "src/mame/machine/k573fpga.cpp", MAME_DIR .. "src/mame/machine/k573fpga.h", + MAME_DIR .. "src/mame/machine/k573kara.cpp", + MAME_DIR .. "src/mame/machine/k573kara.h", MAME_DIR .. "src/mame/machine/k573mcr.cpp", MAME_DIR .. "src/mame/machine/k573mcr.h", MAME_DIR .. "src/mame/machine/k573msu.cpp", @@ -2922,6 +2925,7 @@ files { MAME_DIR .. "src/mame/drivers/cgang.cpp", MAME_DIR .. "src/mame/drivers/cswat.cpp", MAME_DIR .. "src/mame/drivers/dambustr.cpp", + MAME_DIR .. "src/mame/drivers/dangbar.cpp", MAME_DIR .. "src/mame/drivers/dkmb.cpp", MAME_DIR .. "src/mame/drivers/gal3.cpp", MAME_DIR .. "src/mame/drivers/galaga.cpp", @@ -3466,6 +3470,7 @@ files { MAME_DIR .. "src/mame/includes/deniam.h", MAME_DIR .. "src/mame/video/deniam.cpp", MAME_DIR .. "src/mame/drivers/dotrikun.cpp", + MAME_DIR .. "src/mame/drivers/fwheel.cpp", MAME_DIR .. "src/mame/drivers/gpworld.cpp", MAME_DIR .. "src/mame/drivers/hikaru.cpp", MAME_DIR .. "src/mame/drivers/hshavoc.cpp", @@ -3675,6 +3680,8 @@ files { MAME_DIR .. "src/mame/machine/315_5338a.h", MAME_DIR .. "src/mame/machine/315_5649.cpp", MAME_DIR .. "src/mame/machine/315_5649.h", + MAME_DIR .. "src/mame/machine/bingoct.cpp", + MAME_DIR .. "src/mame/machine/bingoct.h", MAME_DIR .. "src/mame/machine/model1io.cpp", MAME_DIR .. "src/mame/machine/model1io.h", MAME_DIR .. "src/mame/machine/model1io2.cpp", @@ -4679,6 +4686,7 @@ files { MAME_DIR .. "src/mame/drivers/ltd.cpp", MAME_DIR .. "src/mame/drivers/macp.cpp", MAME_DIR .. "src/mame/drivers/micropin.cpp", + MAME_DIR .. "src/mame/drivers/missamer.cpp", MAME_DIR .. "src/mame/drivers/mephistp.cpp", MAME_DIR .. "src/mame/drivers/mrgame.cpp", MAME_DIR .. "src/mame/drivers/nsm.cpp", @@ -5056,6 +5064,7 @@ files { MAME_DIR .. "src/mame/drivers/pipeline.cpp", MAME_DIR .. "src/mame/drivers/pkscram.cpp", MAME_DIR .. "src/mame/drivers/playcenter.cpp", + MAME_DIR .. "src/mame/drivers/plsonic4.cpp", MAME_DIR .. "src/mame/drivers/pntnpuzl.cpp", MAME_DIR .. "src/mame/drivers/policetr.cpp", MAME_DIR .. "src/mame/includes/policetr.h", diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 75983e71ea6..a8863d06bc8 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -99,6 +99,7 @@ CPUS["F8"] = true CPUS["LH5801"] = true CPUS["PATINHOFEIO"] = true CPUS["PDP1"] = true +CPUS["PDP8"] = true CPUS["TX0"] = true CPUS["SATURN"] = true CPUS["SC61860"] = true @@ -182,7 +183,10 @@ SOUNDS["SPEAKER"] = true SOUNDS["BEEP"] = true SOUNDS["DISCRETE"] = true SOUNDS["AY8910"] = true +SOUNDS["YM2154"] = true SOUNDS["YM2151"] = true +SOUNDS["YM2414"] = true +SOUNDS["YM3806"] = true SOUNDS["YM2203"] = true SOUNDS["YM2413"] = true SOUNDS["YM2608"] = true @@ -455,7 +459,6 @@ MACHINES["MPCC68561"] = true MACHINES["68681"] = true MACHINES["7200FIFO"] = true MACHINES["8530SCC"] = true -MACHINES["AAKARTDEV"] = true MACHINES["ACIA6850"] = true MACHINES["ACORN_IOC"] = true MACHINES["ACORN_MEMC"] = true @@ -479,6 +482,7 @@ MACHINES["AMIGAFDC"] = true MACHINES["ARM_IOMD"] = true MACHINES["AT_KEYBC"] = true MACHINES["AT28C16"] = true +MACHINES["AT28C64B"] = true MACHINES["AT29X"] = true MACHINES["AT45DBXX"] = true MACHINES["ATAFLASH"] = true @@ -491,6 +495,7 @@ MACHINES["CDP1852"] = true MACHINES["CDP1871"] = true MACHINES["CDP1879"] = true --MACHINES["CDU76S"] = true +MACHINES["CH376"] = true MACHINES["CHESSMACHINE"] = true MACHINES["CMOS40105"] = true MACHINES["COM52C50"] = true @@ -619,7 +624,6 @@ MACHINES["MSM58321"] = true MACHINES["MSM6242"] = true --MACHINES["MSM6253"] = true MACHINES["MYB3K_KEYBOARD"] = true -MACHINES["NCR5380"] = true MACHINES["NCR5380N"] = true MACHINES["NCR5385"] = true MACHINES["NCR5390"] = true @@ -934,6 +938,7 @@ BUSES["QBUS"] = true BUSES["RS232"] = true BUSES["RTPC_KBD"] = true BUSES["S100"] = true +BUSES["SAITEK_OSA"] = true BUSES["SAMCOUPE_DRIVE_PORT"] = true BUSES["SAMCOUPE_EXPANSION"] = true BUSES["SAMCOUPE_MOUSE_PORT"] = true @@ -1150,6 +1155,8 @@ FORMATS["VECTOR06_DSK"] = true FORMATS["VG5K_CAS"] = true FORMATS["VICTOR9K_DSK"] = true FORMATS["VT_CAS"] = true +FORMATS["VT_DSK"] = true +FORMATS["FS_VTECH"] = true FORMATS["WD177X_DSK"] = true FORMATS["X07_CAS"] = true FORMATS["X1_TAP"] = true @@ -1284,6 +1291,7 @@ function linkProjects_mame_mess(_target, _subtarget) "kontron", "korg", "kurzweil", + "kyber", "kyocera", "leapfrog", "learsiegler", @@ -1297,6 +1305,7 @@ function linkProjects_mame_mess(_target, _subtarget) "mchester", "memotech", "mera", + "mg1", "mgu", "microkey", "microsoft", @@ -1484,7 +1493,6 @@ function createProjects_mame_mess(_target, _subtarget) if (_subtarget=="mess") then createMESSProjects(_target, _subtarget, "mameshared") files { - MAME_DIR .. "src/mame/machine/archimds.cpp", MAME_DIR .. "src/mame/machine/amiga.cpp", MAME_DIR .. "src/mame/video/amiga.cpp", MAME_DIR .. "src/mame/video/amigaaga.cpp", @@ -1818,6 +1826,8 @@ files { MAME_DIR .. "src/mame/machine/macpci.cpp", MAME_DIR .. "src/mame/machine/cuda.cpp", MAME_DIR .. "src/mame/machine/cuda.h", + MAME_DIR .. "src/mame/machine/macscsi.cpp", + MAME_DIR .. "src/mame/machine/macscsi.h", MAME_DIR .. "src/mame/drivers/iphone2g.cpp", MAME_DIR .. "src/mame/drivers/superga2.cpp", } @@ -2216,6 +2226,7 @@ files { createMESSProjects(_target, _subtarget, "dec") files { MAME_DIR .. "src/mame/drivers/dct11em.cpp", + MAME_DIR .. "src/mame/drivers/decmate2.cpp", MAME_DIR .. "src/mame/drivers/decstation.cpp", MAME_DIR .. "src/mame/machine/decioga.cpp", MAME_DIR .. "src/mame/machine/decioga.h", @@ -2516,9 +2527,7 @@ files { createMESSProjects(_target, _subtarget, "h01x") files { - MAME_DIR .. "src/mame/includes/h01x.h", MAME_DIR .. "src/mame/drivers/h01x.cpp", - MAME_DIR .. "src/mame/video/h01x.cpp", } createMESSProjects(_target, _subtarget, "hartung") @@ -2813,6 +2822,11 @@ files { MAME_DIR .. "src/mame/drivers/krz2000.cpp", } +createMESSProjects(_target, _subtarget, "kyber") +files { + MAME_DIR .. "src/mame/drivers/kminus.cpp", +} + createMESSProjects(_target, _subtarget, "kyocera") files { MAME_DIR .. "src/mame/drivers/kyocera.cpp", @@ -2824,6 +2838,7 @@ createMESSProjects(_target, _subtarget, "leapfrog") files { MAME_DIR .. "src/mame/drivers/leapster.cpp", MAME_DIR .. "src/mame/drivers/leapfrog_leappad.cpp", + MAME_DIR .. "src/mame/drivers/leapfrog_leapster_explorer.cpp", MAME_DIR .. "src/mame/drivers/leapfrog_iquest.cpp", } @@ -2917,6 +2932,11 @@ files { MAME_DIR .. "src/mame/drivers/vdm7932x.cpp", } +createMESSProjects(_target, _subtarget, "mg1") +files { + MAME_DIR .. "src/mame/drivers/mg1.cpp", +} + createMESSProjects(_target, _subtarget, "mgu") files { MAME_DIR .. "src/mame/drivers/irisha.cpp", @@ -3887,7 +3907,10 @@ files { MAME_DIR .. "src/mame/includes/tek405x.h", MAME_DIR .. "src/mame/drivers/tek410x.cpp", MAME_DIR .. "src/mame/drivers/tek440x.cpp", + MAME_DIR .. "src/mame/drivers/tekigw.cpp", MAME_DIR .. "src/mame/drivers/tekxp33x.cpp", + MAME_DIR .. "src/mame/machine/tek410x_kbd.cpp", + MAME_DIR .. "src/mame/machine/tek410x_kbd.h", } createMESSProjects(_target, _subtarget, "telenova") @@ -4024,6 +4047,7 @@ files { MAME_DIR .. "src/mame/drivers/amico2k.cpp", MAME_DIR .. "src/mame/drivers/babbage.cpp", MAME_DIR .. "src/mame/drivers/bob85.cpp", + MAME_DIR .. "src/mame/drivers/crei680.cpp", MAME_DIR .. "src/mame/drivers/cvicny.cpp", MAME_DIR .. "src/mame/drivers/datum.cpp", MAME_DIR .. "src/mame/drivers/dolphunk.cpp", @@ -4224,6 +4248,7 @@ files { createMESSProjects(_target, _subtarget, "veb") files { MAME_DIR .. "src/mame/drivers/chessmst.cpp", + MAME_DIR .. "src/mame/drivers/chessmstdm.cpp", MAME_DIR .. "src/mame/drivers/kc.cpp", MAME_DIR .. "src/mame/includes/kc.h", MAME_DIR .. "src/mame/machine/kc.cpp", @@ -4281,39 +4306,40 @@ files { createMESSProjects(_target, _subtarget, "vtech") files { + MAME_DIR .. "src/mame/drivers/clickstart.cpp", 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/audio/nl_gamemachine.h", MAME_DIR .. "src/mame/audio/nl_gamemachine.cpp", + MAME_DIR .. "src/mame/audio/nl_gamemachine.h", MAME_DIR .. "src/mame/drivers/geniusiq.cpp", MAME_DIR .. "src/mame/drivers/geniusjr.cpp", MAME_DIR .. "src/mame/drivers/gkidabc.cpp", MAME_DIR .. "src/mame/drivers/glcx.cpp", - MAME_DIR .. "src/mame/drivers/vtech_eu3a12.cpp", + MAME_DIR .. "src/mame/drivers/innotv_innotabmax.cpp", + MAME_DIR .. "src/mame/drivers/inteladv.cpp", MAME_DIR .. "src/mame/drivers/iqunlim.cpp", MAME_DIR .. "src/mame/drivers/laser3k.cpp", MAME_DIR .. "src/mame/drivers/lcmate2.cpp", + MAME_DIR .. "src/mame/drivers/pc2000.cpp", MAME_DIR .. "src/mame/drivers/pc4.cpp", MAME_DIR .. "src/mame/includes/pc4.h", MAME_DIR .. "src/mame/video/pc4.cpp", - MAME_DIR .. "src/mame/drivers/pc2000.cpp", MAME_DIR .. "src/mame/drivers/prestige.cpp", - MAME_DIR .. "src/mame/drivers/vtech1.cpp", - MAME_DIR .. "src/mame/drivers/vtech2.cpp", - MAME_DIR .. "src/mame/includes/vtech2.h", - MAME_DIR .. "src/mame/machine/vtech2.cpp", - MAME_DIR .. "src/mame/video/vtech2.cpp", MAME_DIR .. "src/mame/drivers/socrates.cpp", 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/storio.cpp", MAME_DIR .. "src/mame/drivers/vsmile.cpp", + MAME_DIR .. "src/mame/includes/vsmile.h", MAME_DIR .. "src/mame/drivers/vsmileb.cpp", - MAME_DIR .. "src/mame/drivers/clickstart.cpp", - MAME_DIR .. "src/mame/drivers/storio.cpp", - MAME_DIR .. "src/mame/drivers/innotv_innotabmax.cpp", + MAME_DIR .. "src/mame/drivers/vtech1.cpp", + MAME_DIR .. "src/mame/drivers/vtech2.cpp", + MAME_DIR .. "src/mame/includes/vtech2.h", + MAME_DIR .. "src/mame/video/vtech2.cpp", + MAME_DIR .. "src/mame/machine/vtech2.cpp", + MAME_DIR .. "src/mame/drivers/vtech_eu3a12.cpp", + MAME_DIR .. "src/mame/drivers/vtech_innotab.cpp", } createMESSProjects(_target, _subtarget, "wang") @@ -4676,6 +4702,7 @@ files { MAME_DIR .. "src/mame/machine/nl_tp1985.cpp", MAME_DIR .. "src/mame/drivers/palestra.cpp", MAME_DIR .. "src/mame/machine/nl_palestra.cpp", + MAME_DIR .. "src/mame/drivers/philipsbo.cpp", MAME_DIR .. "src/mame/drivers/mindset.cpp", MAME_DIR .. "src/mame/drivers/gs6502.cpp", MAME_DIR .. "src/mame/drivers/gs6809.cpp", diff --git a/scripts/target/mame/virtual.lua b/scripts/target/mame/virtual.lua index 2d1c866d51a..6bd3c77cc80 100644 --- a/scripts/target/mame/virtual.lua +++ b/scripts/target/mame/virtual.lua @@ -56,7 +56,10 @@ SOUNDS["VGMVIZ"] = true SOUNDS["WAVE"] = true SOUNDS["X1_010"] = true SOUNDS["Y8950"] = true +SOUNDS["YM2154"] = true SOUNDS["YM2151"] = true +SOUNDS["YM2414"] = true +SOUNDS["YM3806"] = true SOUNDS["YM2203"] = true SOUNDS["YM2413"] = true SOUNDS["YM2608"] = true |