diff options
author | 2020-03-26 12:54:28 +1100 | |
---|---|---|
committer | 2020-03-26 12:54:28 +1100 | |
commit | 75e0ed7918a4656755a08bdb7025af579615e033 (patch) | |
tree | 7e5061afb9d701862e2f27369a4019e8cd5fdb13 /docs/release/scripts/src | |
parent | 053c04ffc930159c538bcd77dd3255c74cdd2951 (diff) |
0.220 Release filestag220
Diffstat (limited to 'docs/release/scripts/src')
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 75 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 95 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 186 | ||||
-rw-r--r-- | docs/release/scripts/src/emu.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/src/formats.lua | 24 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 88 | ||||
-rw-r--r-- | docs/release/scripts/src/main.lua | 1 | ||||
-rw-r--r-- | docs/release/scripts/src/mame/frontend.lua | 10 | ||||
-rw-r--r-- | docs/release/scripts/src/netlist.lua | 3 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/mac_cfg.lua | 13 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 37 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl.lua | 5 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl_cfg.lua | 13 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/windows.lua | 1 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/windows_cfg.lua | 14 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui.lua | 1 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui_cfg.lua | 13 | ||||
-rw-r--r-- | docs/release/scripts/src/sound.lua | 38 | ||||
-rw-r--r-- | docs/release/scripts/src/tools.lua | 58 | ||||
-rw-r--r-- | docs/release/scripts/src/video.lua | 2 |
20 files changed, 553 insertions, 128 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index db0e89ca862..1ea65fa45d7 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -51,6 +51,7 @@ end "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter "/wd4127", -- warning C4127: conditional expression is constant "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } if _OPTIONS["vs"]=="intel-15" then buildoptions { @@ -60,10 +61,6 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "vs201*" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - } configuration { } files { @@ -77,6 +74,7 @@ links { } end + -------------------------------------------------- -- zlib library objects -------------------------------------------------- @@ -142,6 +140,7 @@ links { } end + -------------------------------------------------- -- SoftFloat library objects -------------------------------------------------- @@ -182,6 +181,7 @@ end MAME_DIR .. "3rdparty/softfloat/fyl2x.c", } + -------------------------------------------------- -- SoftFloat 3 library objects -------------------------------------------------- @@ -526,6 +526,7 @@ files { MAME_DIR .. "3rdparty/softfloat3/source/f128M_lt_quiet.c", } + ------------------------------------------------- -- libJPEG library objects -------------------------------------------------- @@ -608,6 +609,7 @@ links { } end + -------------------------------------------------- -- libflac library objects -------------------------------------------------- @@ -622,6 +624,7 @@ project "flac" "/wd4127", -- warning C4127: conditional expression is constant "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter + "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4702", -- warning C4702: unreachable code } if _OPTIONS["vs"]=="intel-15" then @@ -639,11 +642,6 @@ end "-include stdint.h" } - configuration { "vs201*" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - } - configuration { "vsllvm" } buildoptions { "-Wno-unused-function", @@ -705,6 +703,7 @@ links { } end + -------------------------------------------------- -- lib7z library objects -------------------------------------------------- @@ -727,17 +726,14 @@ project "7z" configuration { "vs*" } buildoptions { "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter + "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration + "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter } if _OPTIONS["vs"]=="intel-15" then buildoptions { "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "vs201*" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter - } configuration { "winstore*" } forcedincludes { MAME_DIR .. "src/osd/uwp/uwpcompat.h" @@ -794,6 +790,7 @@ end -- MAME_DIR .. "3rdparty/lzma/C/XzIn.c", } + -------------------------------------------------- -- LUA library objects -------------------------------------------------- @@ -899,6 +896,7 @@ links { } end + -------------------------------------------------- -- small lua library objects -------------------------------------------------- @@ -1005,9 +1003,12 @@ links { end end + + -------------------------------------------------- -- portmidi library objects -------------------------------------------------- + if _OPTIONS["NO_USE_MIDI"]~="1" then if not _OPTIONS["with-system-portmidi"] then project "portmidi" @@ -1024,6 +1025,7 @@ project "portmidi" "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter "/wd4127", -- warning C4127: conditional expression is constant "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4706", -- warning C4706: assignment within conditional expression } if _OPTIONS["vs"]=="intel-15" then @@ -1035,11 +1037,6 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "vs201*" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - } - configuration { "linux*" } defines { "PMALSA=1", @@ -1093,6 +1090,7 @@ links { end end + -------------------------------------------------- -- BX library objects -------------------------------------------------- @@ -1171,6 +1169,7 @@ project "bx" MAME_DIR .. "3rdparty/bx/src/url.cpp", } + -------------------------------------------------- -- BIMG library objects -------------------------------------------------- @@ -1246,6 +1245,7 @@ project "bimg" MAME_DIR .. "3rdparty/bimg/3rdparty/astc-codec/src/decoder/weight_infill.cc", } + -------------------------------------------------- -- BGFX library objects -------------------------------------------------- @@ -1434,9 +1434,11 @@ end } end + -------------------------------------------------- -- PortAudio library objects -------------------------------------------------- + if _OPTIONS["NO_USE_PORTAUDIO"]~="1" then if not _OPTIONS["with-system-portaudio"] then project "portaudio" @@ -1451,6 +1453,8 @@ project "portaudio" "/wd4389", -- warning C4389: 'operator' : signed/unsigned mismatch "/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced "/wd4127", -- warning C4127: conditional expression is constant + "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration + "/wd4312", -- warning C4312: 'type cast': conversion from 'UINT' to 'HWAVEIN' of greater size } if _OPTIONS["vs"]=="intel-15" then buildoptions { @@ -1460,10 +1464,6 @@ project "portaudio" "/Qwd1879", -- warning #1879: unimplemented pragma ignored } end - configuration { "vs2015*" } - buildoptions { - "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration - } configuration { "vsllvm" } buildoptions { @@ -1607,6 +1607,7 @@ links { end end + -------------------------------------------------- -- SDL2 library -------------------------------------------------- @@ -2117,9 +2118,11 @@ end end + -------------------------------------------------- -- linenoise library -------------------------------------------------- + if (_OPTIONS["osd"] ~= "uwp") then project "linenoise" uuid "7320ffc8-2748-4add-8864-ae29b72a8511" @@ -2154,9 +2157,9 @@ project "utf8proc" uuid "1f881f09-0395-4483-ac37-2935fb092187" kind "StaticLib" - defines { - "UTF8PROC_DLLEXPORT=" - } + defines { + "UTF8PROC_DLLEXPORT=" + } configuration "Debug" defines { @@ -2182,3 +2185,23 @@ links { } end + +-------------------------------------------------- +-- wdlfft library objects (from Cockos WDL) +-------------------------------------------------- + +project "wdlfft" + uuid "74ca017e-fa0d-48b8-81d6-8081a37be14c" + kind "StaticLib" + + configuration { "gmake or ninja" } + buildoptions_c { + "-Wno-strict-prototypes", + } + + configuration { } + + files { + MAME_DIR .. "3rdparty/wdlfft/fft.c", + MAME_DIR .. "3rdparty/wdlfft/fft.h" + } diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index d917a846642..2b64a7008a4 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -125,6 +125,8 @@ if (BUSES["ACORN"]~=null) then MAME_DIR .. "src/devices/bus/acorn/cms/fdc.h", MAME_DIR .. "src/devices/bus/acorn/cms/hires.cpp", MAME_DIR .. "src/devices/bus/acorn/cms/hires.h", + MAME_DIR .. "src/devices/bus/acorn/cms/ieee.cpp", + MAME_DIR .. "src/devices/bus/acorn/cms/ieee.h", MAME_DIR .. "src/devices/bus/acorn/system/32k.cpp", MAME_DIR .. "src/devices/bus/acorn/system/32k.h", MAME_DIR .. "src/devices/bus/acorn/system/8k.cpp", @@ -458,6 +460,21 @@ end --------------------------------------------------- -- +--@src/devices/bus/bbc/modem/modem.h,BUSES["BBC_MODEM"] = true +--------------------------------------------------- + +if (BUSES["BBC_MODEM"]~=null) then + files { + MAME_DIR .. "src/devices/bus/bbc/modem/modem.cpp", + MAME_DIR .. "src/devices/bus/bbc/modem/modem.h", + MAME_DIR .. "src/devices/bus/bbc/modem/scsiaiv.cpp", + MAME_DIR .. "src/devices/bus/bbc/modem/scsiaiv.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/bbc/1mhzbus/1mhzbus.h,BUSES["BBC_1MHZBUS"] = true --------------------------------------------------- @@ -467,20 +484,34 @@ if (BUSES["BBC_1MHZBUS"]~=null) then MAME_DIR .. "src/devices/bus/bbc/1mhzbus/1mhzbus.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/autoprom.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/autoprom.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebopl.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebopl.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/cc500.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cc500.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/datacentre.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/datacentre.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/ide.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ide.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/multiform.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/multiform.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/pdram.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/pdram.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/pms64k.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/pms64k.h", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ramdisc.cpp", MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ramdisc.h", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/scsi.cpp", + MAME_DIR .. "src/devices/bus/bbc/1mhzbus/scsi.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", @@ -558,6 +589,8 @@ if (BUSES["BBC_USERPORT"]~=null) then MAME_DIR .. "src/devices/bus/bbc/userport/userport.h", MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.cpp", MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.h", + MAME_DIR .. "src/devices/bus/bbc/userport/palette.cpp", + MAME_DIR .. "src/devices/bus/bbc/userport/palette.h", MAME_DIR .. "src/devices/bus/bbc/userport/pointer.cpp", MAME_DIR .. "src/devices/bus/bbc/userport/pointer.h", MAME_DIR .. "src/devices/bus/bbc/userport/usersplit.cpp", @@ -1405,6 +1438,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/svga_cirrus.h", MAME_DIR .. "src/devices/bus/isa/ega.cpp", MAME_DIR .. "src/devices/bus/isa/ega.h", + MAME_DIR .. "src/devices/bus/isa/ex1280.cpp", + MAME_DIR .. "src/devices/bus/isa/ex1280.h", MAME_DIR .. "src/devices/bus/isa/pgc.cpp", MAME_DIR .. "src/devices/bus/isa/pgc.h", MAME_DIR .. "src/devices/bus/isa/vga.cpp", @@ -1483,6 +1518,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/tekram_dc820.h", MAME_DIR .. "src/devices/bus/isa/asc88.cpp", MAME_DIR .. "src/devices/bus/isa/asc88.h", + MAME_DIR .. "src/devices/bus/isa/bblue2.cpp", + MAME_DIR .. "src/devices/bus/isa/bblue2.h", } end @@ -2267,6 +2304,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/4play.h", MAME_DIR .. "src/devices/bus/a2bus/computereyes2.cpp", MAME_DIR .. "src/devices/bus/a2bus/computereyes2.h", + MAME_DIR .. "src/devices/bus/a2bus/byte8251.cpp", + MAME_DIR .. "src/devices/bus/a2bus/byte8251.h", } end @@ -2354,6 +2393,8 @@ if (BUSES["NUBUS"]~=null) then MAME_DIR .. "src/devices/bus/nubus/bootbug.h", MAME_DIR .. "src/devices/bus/nubus/quadralink.cpp", MAME_DIR .. "src/devices/bus/nubus/quadralink.h", + MAME_DIR .. "src/devices/bus/nubus/laserview.cpp", + MAME_DIR .. "src/devices/bus/nubus/laserview.h", MAME_DIR .. "src/devices/bus/nubus/pds30_cb264.cpp", MAME_DIR .. "src/devices/bus/nubus/pds30_cb264.h", MAME_DIR .. "src/devices/bus/nubus/pds30_procolor816.cpp", @@ -2649,6 +2690,20 @@ end --------------------------------------------------- -- +--@src/devices/bus/sdk85/memexp.h,BUSES["SDK85"] = true +--------------------------------------------------- + +if (BUSES["SDK85"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sdk85/memexp.cpp", + MAME_DIR .. "src/devices/bus/sdk85/memexp.h", + MAME_DIR .. "src/devices/bus/sdk85/i8755.cpp", + MAME_DIR .. "src/devices/bus/sdk85/i8755.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/snes/snes_slot.h,BUSES["SNES"] = true --------------------------------------------------- @@ -3095,8 +3150,14 @@ if (BUSES["TI99"]~=null) then MAME_DIR .. "src/devices/bus/ti99/peb/peribox.h", MAME_DIR .. "src/devices/bus/ti99/peb/bwg.cpp", MAME_DIR .. "src/devices/bus/ti99/peb/bwg.h", + MAME_DIR .. "src/devices/bus/ti99/peb/cc_fdc.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/cc_fdc.h", + MAME_DIR .. "src/devices/bus/ti99/peb/myarcfdc.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/myarcfdc.h", MAME_DIR .. "src/devices/bus/ti99/peb/evpc.cpp", MAME_DIR .. "src/devices/bus/ti99/peb/evpc.h", + MAME_DIR .. "src/devices/bus/ti99/peb/forti.cpp", + MAME_DIR .. "src/devices/bus/ti99/peb/forti.h", MAME_DIR .. "src/devices/bus/ti99/peb/hfdc.cpp", MAME_DIR .. "src/devices/bus/ti99/peb/hfdc.h", MAME_DIR .. "src/devices/bus/ti99/peb/horizon.cpp", @@ -3217,6 +3278,8 @@ if (BUSES["COCO"]~=null) then MAME_DIR .. "src/devices/bus/coco/coco_dwsock.h", MAME_DIR .. "src/devices/bus/coco/coco_t4426.cpp", MAME_DIR .. "src/devices/bus/coco/coco_t4426.h", + MAME_DIR .. "src/devices/bus/coco/coco_psg.cpp", + MAME_DIR .. "src/devices/bus/coco/coco_psg.h", MAME_DIR .. "src/devices/bus/coco/dragon_amtor.cpp", MAME_DIR .. "src/devices/bus/coco/dragon_amtor.h", MAME_DIR .. "src/devices/bus/coco/dragon_fdc.cpp", @@ -3901,8 +3964,12 @@ if (BUSES["HP80_IO"]~=null) then files { MAME_DIR .. "src/devices/bus/hp80_io/hp80_io.cpp", MAME_DIR .. "src/devices/bus/hp80_io/hp80_io.h", + MAME_DIR .. "src/devices/bus/hp80_io/82900.cpp", + MAME_DIR .. "src/devices/bus/hp80_io/82900.h", MAME_DIR .. "src/devices/bus/hp80_io/82937.cpp", MAME_DIR .. "src/devices/bus/hp80_io/82937.h", + MAME_DIR .. "src/devices/bus/hp80_io/82939.cpp", + MAME_DIR .. "src/devices/bus/hp80_io/82939.h", } end @@ -4085,3 +4152,31 @@ if (BUSES["TMC600"]~=null) then MAME_DIR .. "src/devices/bus/tmc600/euro.h", } end + +--------------------------------------------------- +-- +--@src/devices/bus/multibus/multibus.h,BUSES["MULTIBUS"] = true +--------------------------------------------------- + +if (BUSES["MULTIBUS"]~=null) then + files { + MAME_DIR .. "src/devices/bus/multibus/multibus.cpp", + MAME_DIR .. "src/devices/bus/multibus/multibus.h", + MAME_DIR .. "src/devices/bus/multibus/isbc202.cpp", + MAME_DIR .. "src/devices/bus/multibus/isbc202.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/rtpc/kbd_con.h,BUSES["RTPC_KBD"] = true +--------------------------------------------------- + +if (BUSES["RTPC_KBD"]~=null) then + files { + MAME_DIR .. "src/devices/bus/rtpc/kbd_con.cpp", + MAME_DIR .. "src/devices/bus/rtpc/kbd_con.h", + MAME_DIR .. "src/devices/bus/rtpc/kbd.cpp", + MAME_DIR .. "src/devices/bus/rtpc/kbd.h", + } +end diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index f027f0aa329..774511e1881 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -2529,6 +2529,8 @@ if (CPUS["Z80"]~=null) then MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.h", MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.cpp", MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.h", + MAME_DIR .. "src/devices/cpu/z80/lz8420m.cpp", + MAME_DIR .. "src/devices/cpu/z80/lz8420m.h", } end @@ -2982,6 +2984,23 @@ if (CPUS["CR16B"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- +-- Gigatron +--@src/devices/cpu/gigatron/gigatron.h,CPUS["GTRON"] = true +-------------------------------------------------- + +if (CPUS["GTRON"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/gigatron/gigatron.cpp", + MAME_DIR .. "src/devices/cpu/gigatron/gigatron.h", + } +end + +if (CPUS["GTRON"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/gigatron/gigatrondasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/gigatron/gigatrondasm.h") +end + +-------------------------------------------------- -- Motorola DSP56000 --@src/devices/cpu/dsp56000/dsp56000.h,CPUS["DSP56000"] = true -------------------------------------------------- @@ -3014,3 +3033,170 @@ if (CPUS["VT50"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/vt50/vt50dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/vt50/vt50dasm.h") end + +-------------------------------------------------- +-- DEC VT61 +--@src/devices/cpu/vt61/vt61.h,CPUS["VT61"] = true +-------------------------------------------------- + +if (CPUS["VT61"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/vt61/vt61.cpp", + MAME_DIR .. "src/devices/cpu/vt61/vt61.h", + } +end + +if (CPUS["VT61"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/vt61/vt61dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/vt61/vt61dasm.h") +end + +-------------------------------------------------- +-- National Semiconductor PACE/INS8900 +--@src/devices/cpu/pace/pace.h,CPUS["PACE"] = true +-------------------------------------------------- + +if (CPUS["PACE"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/pace/pace.cpp", + MAME_DIR .. "src/devices/cpu/pace/pace.h", + } +end + +if (CPUS["PACE"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pace/pacedasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pace/pacedasm.h") +end + +-------------------------------------------------- +-- AT&T WE32000/WE32100/WE32200 +--@src/devices/cpu/we32000/we32100.h,CPUS["WE32000"] = true +-------------------------------------------------- + +if (CPUS["WE32000"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/we32000/we32100.cpp", + MAME_DIR .. "src/devices/cpu/we32000/we32100.h", + } +end + +if (CPUS["WE32000"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/we32000/we32100d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/we32000/we32100d.h") +end + +-------------------------------------------------- +-- DEC RX01 +--@src/devices/cpu/rx01/rx01.h,CPUS["RX01"] = true +-------------------------------------------------- + +if (CPUS["RX01"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/rx01/rx01.cpp", + MAME_DIR .. "src/devices/cpu/rx01/rx01.h", + } +end + +if (CPUS["RX01"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/rx01/rx01dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/rx01/rx01dasm.h") +end + +-------------------------------------------------- +-- Motorola M88000 +--@src/devices/cpu/m88000/m88000.h,CPUS["M88000"] = true +-------------------------------------------------- + +if (CPUS["M88000"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/m88000/m88000.cpp", + MAME_DIR .. "src/devices/cpu/m88000/m88000.h", + } +end + +if (CPUS["M88000"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m88000/m88000d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m88000/m88000d.h") +end + +-------------------------------------------------- +-- XAVIX2 +--@src/devices/cpu/xavix2/xavix2.h,CPUS["XAVIX2"] = true +-------------------------------------------------- + +if (CPUS["XAVIX2"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/xavix2/xavix2.cpp", + MAME_DIR .. "src/devices/cpu/xavix2/xavix2.h", + } +end + +if (CPUS["XAVIX2"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/xavix2/xavix2d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/xavix2/xavix2d.h") +end + +-------------------------------------------------- +-- NEC 78K +--@src/devices/cpu/upd78k/upd78k0.h,CPUS["UPD78K"] = true +--@src/devices/cpu/upd78k/upd78k2.h,CPUS["UPD78K"] = true +--@src/devices/cpu/upd78k/upd78k3.h,CPUS["UPD78K"] = true +-------------------------------------------------- + +if (CPUS["UPD78K"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/upd78k/upd78k0.cpp", + MAME_DIR .. "src/devices/cpu/upd78k/upd78k0.h", + MAME_DIR .. "src/devices/cpu/upd78k/upd78k2.cpp", + MAME_DIR .. "src/devices/cpu/upd78k/upd78k2.h", + MAME_DIR .. "src/devices/cpu/upd78k/upd78k3.cpp", + MAME_DIR .. "src/devices/cpu/upd78k/upd78k3.h", + } +end + +if (CPUS["UPD78K"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78kd.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78kd.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k0d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k0d.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k1d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k1d.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k2d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k2d.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k3d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd78k/upd78k3d.h") +end + +-------------------------------------------------- +-- IBM ROMP +--@src/devices/cpu/romp/romp.h,CPUS["ROMP"] = true +-------------------------------------------------- + +if (CPUS["ROMP"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/romp/romp.cpp", + MAME_DIR .. "src/devices/cpu/romp/romp.h", + } +end + +if (CPUS["ROMP"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/romp/rompdasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/romp/rompdasm.h") +end + +-------------------------------------------------- +-- KS0164 +--@src/devices/cpu/ks0164/ks0164.h,CPUS["KS0164"] = true +-------------------------------------------------- + +if (CPUS["KS0164"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/ks0164/ks0164.cpp", + MAME_DIR .. "src/devices/cpu/ks0164/ks0164.h", + } +end + +if (CPUS["KS0164"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ks0164/ks0164d.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ks0164/ks0164d.h") +end diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index 1561bb1b691..b8b08385e68 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -283,11 +283,11 @@ dependency { } custombuildtask { - { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall uint8_t" }}, + { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, { "@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall uint8_t" } }, } custombuildtask { - { MAME_DIR .. "src/frontend/mame/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 uint8_t" }}, + { MAME_DIR .. "src/frontend/mame/ui/uicmd14.png", GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, { "@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 uint8_t" } }, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/docs/release/scripts/src/formats.lua b/docs/release/scripts/src/formats.lua index 6bb724e3e40..c234f37808b 100644 --- a/docs/release/scripts/src/formats.lua +++ b/docs/release/scripts/src/formats.lua @@ -1003,6 +1003,18 @@ end -------------------------------------------------- -- +--@src/lib/formats/img_dsk.h,FORMATS["IMG_DSK"] = true +-------------------------------------------------- + +if (FORMATS["IMG_DSK"]~=null or _OPTIONS["with-tools"]) then + files { + MAME_DIR.. "src/lib/formats/img_dsk.cpp", + MAME_DIR.. "src/lib/formats/img_dsk.h", + } +end + +-------------------------------------------------- +-- --@src/lib/formats/iq151_dsk.h,FORMATS["IQ151_DSK"] = true -------------------------------------------------- @@ -1351,6 +1363,18 @@ end -------------------------------------------------- -- +--@src/lib/formats/ibmxdf_dsk.h,FORMATS["IBMXDF_DSK"] = true +-------------------------------------------------- + +if (FORMATS["IBMXDF_DSK"]~=null or _OPTIONS["with-tools"]) then + files { + MAME_DIR.. "src/lib/formats/ibmxdf_dsk.cpp", + MAME_DIR.. "src/lib/formats/ibmxdf_dsk.h", + } +end + +-------------------------------------------------- +-- --@src/lib/formats/p6001_cas.h,FORMATS["P6001_CAS"] = true -------------------------------------------------- diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 80bf9d75f50..5440a43be20 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -705,6 +705,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/am79c30.h,MACHINES["AM79C30"] = true +--------------------------------------------------- + +if (MACHINES["AM79C30"]~=null) then + files { + MAME_DIR .. "src/devices/machine/am79c30.cpp", + MAME_DIR .. "src/devices/machine/am79c30.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/am79c90.h,MACHINES["AM79C90"] = true --------------------------------------------------- @@ -1873,25 +1885,25 @@ end --------------------------------------------------- -- ---@src/devices/machine/mc2661.h,MACHINES["MC2661"] = true +--@src/devices/machine/mc6843.h,MACHINES["MC6843"] = true --------------------------------------------------- -if (MACHINES["MC2661"]~=null) then +if (MACHINES["MC6843"]~=null) then files { - MAME_DIR .. "src/devices/machine/mc2661.cpp", - MAME_DIR .. "src/devices/machine/mc2661.h", + MAME_DIR .. "src/devices/machine/mc6843.cpp", + MAME_DIR .. "src/devices/machine/mc6843.h", } end --------------------------------------------------- -- ---@src/devices/machine/mc6843.h,MACHINES["MC6843"] = true +--@src/devices/machine/mc6844.h,MACHINES["MC6844"] = true --------------------------------------------------- -if (MACHINES["MC6843"]~=null) then +if (MACHINES["MC6844"]~=null) then files { - MAME_DIR .. "src/devices/machine/mc6843.cpp", - MAME_DIR .. "src/devices/machine/mc6843.h", + MAME_DIR .. "src/devices/machine/mc6844.cpp", + MAME_DIR .. "src/devices/machine/mc6844.h", } end @@ -2697,6 +2709,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/scnxx562.h,MACHINES["SCN_PCI"] = true +--------------------------------------------------- + +if (MACHINES["SCN_PCI"]~=null) then + files { + MAME_DIR .. "src/devices/machine/scn_pci.cpp", + MAME_DIR .. "src/devices/machine/scn_pci.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/scnxx562.h,MACHINES["DUSCC"] = true --------------------------------------------------- @@ -3132,6 +3156,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/vic_pl192.h,MACHINES["VIC_PL192"] = true +--------------------------------------------------- + +if (MACHINES["VIC_PL192"]~=null) then + files { + MAME_DIR .. "src/devices/machine/vic_pl192.cpp", + MAME_DIR .. "src/devices/machine/vic_pl192.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/wd_fdc.h,MACHINES["WD_FDC"] = true --------------------------------------------------- @@ -3301,18 +3337,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/z80dart.h,MACHINES["Z80DART"] = true ---------------------------------------------------- - -if (MACHINES["Z80DART"]~=null) then - files { - MAME_DIR .. "src/devices/machine/z80dart.cpp", - MAME_DIR .. "src/devices/machine/z80dart.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/z80sio.h,MACHINES["Z80SIO"] = true --------------------------------------------------- @@ -4196,3 +4220,27 @@ if (MACHINES["VRENDER0"]~=null) then MAME_DIR .. "src/devices/machine/vrender0.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/i3001.h,MACHINES["I3001"] = true +--------------------------------------------------- + +if (MACHINES["I3001"]~=null) then + files { + MAME_DIR .. "src/devices/machine/i3001.cpp", + MAME_DIR .. "src/devices/machine/i3001.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/i3002.h,MACHINES["I3002"] = true +--------------------------------------------------- + +if (MACHINES["I3002"]~=null) then + files { + MAME_DIR .. "src/devices/machine/i3002.cpp", + MAME_DIR .. "src/devices/machine/i3002.h", + } +end diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index c1c6d47c46b..92b92a70f05 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -258,6 +258,7 @@ end ext_lib("expat"), "softfloat", "softfloat3", + "wdlfft", ext_lib("jpeg"), "7z", } diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index 826b004df4a..8253bf439b5 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -79,6 +79,8 @@ files { MAME_DIR .. "src/frontend/mame/media_ident.h", MAME_DIR .. "src/frontend/mame/pluginopts.cpp", MAME_DIR .. "src/frontend/mame/pluginopts.h", + MAME_DIR .. "src/frontend/mame/ui/about.cpp", + MAME_DIR .. "src/frontend/mame/ui/about.h", MAME_DIR .. "src/frontend/mame/ui/analogipt.cpp", MAME_DIR .. "src/frontend/mame/ui/analogipt.cpp", MAME_DIR .. "src/frontend/mame/ui/auditmenu.cpp", @@ -174,3 +176,11 @@ files { } pchsource(MAME_DIR .. "src/frontend/mame/audit.cpp") + +dependency { + { MAME_DIR .. "src/frontend/mame/ui/about.cpp", GEN_DIR .. "emu/copying.ipp" }, +} + +custombuildtask { + { MAME_DIR .. "COPYING", GEN_DIR .. "emu/copying.ipp", { MAME_DIR .. "scripts/build/file2lines.py" }, { "@echo Converting COPYING...", PYTHON .. " $(1) $(<) $(@) copying_text" } }, +} diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua index 70ff1f54467..3bc6cb34645 100644 --- a/docs/release/scripts/src/netlist.lua +++ b/docs/release/scripts/src/netlist.lua @@ -120,6 +120,8 @@ project "netlist" 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_4006.cpp", + MAME_DIR .. "src/lib/netlist/devices/nld_4006.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", @@ -218,7 +220,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_system.h", MAME_DIR .. "src/lib/netlist/devices/nlid_truthtable.cpp", MAME_DIR .. "src/lib/netlist/devices/nlid_truthtable.h", - MAME_DIR .. "src/lib/netlist/devices/nlid_cmos.h", MAME_DIR .. "src/lib/netlist/devices/nlid_system.h", MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp", MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h", diff --git a/docs/release/scripts/src/osd/mac_cfg.lua b/docs/release/scripts/src/osd/mac_cfg.lua index 76f0ac4ac1b..baa23831723 100644 --- a/docs/release/scripts/src/osd/mac_cfg.lua +++ b/docs/release/scripts/src/osd/mac_cfg.lua @@ -7,11 +7,20 @@ forcedincludes { -- MAME_DIR .. "src/osd/sdl/sdlprefix.h" } -if not _OPTIONS["DONT_USE_NETWORK"] then +if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]==1 then defines { "USE_NETWORK", - "OSD_NET_USE_PCAP", } + if _OPTIONS["USE_TAPTUN"]=="1" then + defines { + "OSD_NET_USE_TAPTUN", + } + end + if _OPTIONS["USE_PCAP"]=="1" then + defines { + "OSD_NET_USE_PCAP", + } + end end defines { diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 0df5597b254..a1b7f1d26df 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -467,8 +467,21 @@ end newoption { - trigger = "DONT_USE_NETWORK", - description = "Disable network access", + trigger = "USE_TAPTUN", + description = "Include tap/tun network module", + allowed = { + { "0", "Don't include tap/tun network module" }, + { "1", "Include tap/tun network module" }, + }, +} + +newoption { + trigger = "USE_PCAP", + description = "Include pcap network module", + allowed = { + { "0", "Don't include pcap network module" }, + { "1", "Include pcap network module" }, + }, } newoption { @@ -540,7 +553,7 @@ newoption { trigger = "USE_QTDEBUG", description = "Use QT debugger", allowed = { - { "0", "Don't use Qt debugger" }, + { "0", "Don't use Qt debugger" }, { "1", "Use Qt debugger" }, }, } @@ -551,8 +564,24 @@ newoption { } +if not _OPTIONS["USE_TAPTUN"] then + if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="windows" then + _OPTIONS["USE_TAPTUN"] = "1" + else + _OPTIONS["USE_TAPTUN"] = "0" + end +end + +if not _OPTIONS["USE_PCAP"] then + if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="netbsd" then + _OPTIONS["USE_PCAP"] = "1" + else + _OPTIONS["USE_PCAP"] = "0" + end +end + if not _OPTIONS["USE_QTDEBUG"] then - if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then + if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then _OPTIONS["USE_QTDEBUG"] = "0" else _OPTIONS["USE_QTDEBUG"] = "1" diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index 43b1e20e079..10aa9940c52 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -239,21 +239,16 @@ end BASE_TARGETOS = "unix" SDLOS_TARGETOS = "unix" -SDL_NETWORK = "" if _OPTIONS["targetos"]=="linux" then - SDL_NETWORK = "taptun" elseif _OPTIONS["targetos"]=="openbsd" then elseif _OPTIONS["targetos"]=="netbsd" then - SDL_NETWORK = "pcap" elseif _OPTIONS["targetos"]=="haiku" then elseif _OPTIONS["targetos"]=="asmjs" then elseif _OPTIONS["targetos"]=="windows" then BASE_TARGETOS = "win32" SDLOS_TARGETOS = "win32" - SDL_NETWORK = "pcap" elseif _OPTIONS["targetos"]=="macosx" then SDLOS_TARGETOS = "macosx" - SDL_NETWORK = "pcap" end if _OPTIONS["with-bundled-sdl2"]~=nil then diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua index ad3750184fd..e942e50fdde 100644 --- a/docs/release/scripts/src/osd/sdl_cfg.lua +++ b/docs/release/scripts/src/osd/sdl_cfg.lua @@ -7,11 +7,20 @@ forcedincludes { MAME_DIR .. "src/osd/sdl/sdlprefix.h" } -if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then +if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]==1 then defines { "USE_NETWORK", - "OSD_NET_USE_" .. string.upper(SDL_NETWORK), } + if _OPTIONS["USE_TAPTUN"]=="1" then + defines { + "OSD_NET_USE_TAPTUN", + } + end + if _OPTIONS["USE_PCAP"]=="1" then + defines { + "OSD_NET_USE_PCAP", + } + end end if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua index ecb3030c683..963980b22ca 100644 --- a/docs/release/scripts/src/osd/windows.lua +++ b/docs/release/scripts/src/osd/windows.lua @@ -227,7 +227,6 @@ project ("ocore_" .. _OPTIONS["osd"]) includedirs { MAME_DIR .. "src/osd/windows", - MAME_DIR .. "src/lib/winpcap", } files { diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua index 2735e4df4f0..10e5ee86a21 100644 --- a/docs/release/scripts/src/osd/windows_cfg.lua +++ b/docs/release/scripts/src/osd/windows_cfg.lua @@ -37,12 +37,20 @@ else } end -if not _OPTIONS["DONT_USE_NETWORK"] then +if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]==1 then defines { "USE_NETWORK", - "OSD_NET_USE_PCAP", - "OSD_NET_USE_TAPTUN", } + if _OPTIONS["USE_TAPTUN"]=="1" then + defines { + "OSD_NET_USE_TAPTUN", + } + end + if _OPTIONS["USE_PCAP"]=="1" then + defines { + "OSD_NET_USE_PCAP", + } + end end if _OPTIONS["USE_SDL"]=="1" then diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index b9aa0b86871..492674947d5 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -260,7 +260,6 @@ project ("ocore_" .. _OPTIONS["osd"]) includedirs { MAME_DIR .. "src/osd/windows", - MAME_DIR .. "src/lib/winpcap", } files { diff --git a/docs/release/scripts/src/osd/winui_cfg.lua b/docs/release/scripts/src/osd/winui_cfg.lua index 20c6034a2e1..5823a20b171 100644 --- a/docs/release/scripts/src/osd/winui_cfg.lua +++ b/docs/release/scripts/src/osd/winui_cfg.lua @@ -17,10 +17,19 @@ configuration { "vs*" } configuration { } -if not _OPTIONS["DONT_USE_NETWORK"] then +if _OPTIONS["USE_TAPTUN"]=="1" or _OPTIONS["USE_PCAP"]==1 then defines { "USE_NETWORK", - "OSD_NET_USE_PCAP", } + if _OPTIONS["USE_TAPTUN"]=="1" then + defines { + "OSD_NET_USE_TAPTUN", + } + end + if _OPTIONS["USE_PCAP"]=="1" then + defines { + "OSD_NET_USE_PCAP", + } + end end diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua index 752b8af30e6..dc0a1a93f07 100644 --- a/docs/release/scripts/src/sound.lua +++ b/docs/release/scripts/src/sound.lua @@ -1436,7 +1436,7 @@ end --------------------------------------------------- -- MM5837 Noise Generator ---@src/devices/sound/mm5837.h,MACHINES["MM5837"] = true +--@src/devices/sound/mm5837.h,SOUNDS["MM5837"] = true --------------------------------------------------- if (SOUNDS["MM5837"]~=null) then @@ -1541,3 +1541,39 @@ if (SOUNDS["SWP30"]~=null) then MAME_DIR .. "src/devices/sound/swp30.h", } end + +--------------------------------------------------- +-- Roland sample players +--@src/devices/sound/rolandpcm.h,SOUNDS["ROLANDPCM"] = true +--------------------------------------------------- + +if (SOUNDS["ROLANDPCM"]~=null) then + files { + MAME_DIR .. "src/devices/sound/rolandpcm.cpp", + MAME_DIR .. "src/devices/sound/rolandpcm.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/sound/vgm_visualizer.h,SOUNDS["VGMVIZ"] = true +--------------------------------------------------- + +if (SOUNDS["VGMVIZ"]~=null) then + files { + MAME_DIR .. "src/devices/sound/vgm_visualizer.cpp", + MAME_DIR .. "src/devices/sound/vgm_visualizer.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/sound/ks0164.h,SOUNDS["KS0164"] = true +--------------------------------------------------- + +if (SOUNDS["KS0164"]~=null) then + files { + MAME_DIR .. "src/devices/sound/ks0164.cpp", + MAME_DIR .. "src/devices/sound/ks0164.h", + } +end diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua index 09f8739e30a..283b53f1b2c 100644 --- a/docs/release/scripts/src/tools.lua +++ b/docs/release/scripts/src/tools.lua @@ -133,15 +133,6 @@ files { configuration { "mingw*" or "vs*" } targetextension ".exe" --- workaround for https://developercommunity.visualstudio.com/content/problem/752372/vs2019-v1631-c-internal-compiler-error-when-zi-opt.html --- should be fixed in 16.5 -configuration { "Debug", "vs2019" } - if _OPTIONS["vs"]==nil then - flags { - "NoEditAndContinue", - } - end - configuration { } strip() @@ -365,46 +356,6 @@ configuration { } strip() -------------------------------------------------- --- src2html --------------------------------------------------- - -project("src2html") -uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7") -kind "ConsoleApp" - -flags { - "Symbols", -- always include minimum symbols for executables -} - -if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) -end - -links { - "utils", - ext_lib("expat"), - "ocore_" .. _OPTIONS["osd"], - ext_lib("zlib"), - ext_lib("utf8proc"), -} - -includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", -} - -files { - MAME_DIR .. "src/tools/src2html.cpp", -} - -configuration { "mingw*" or "vs*" } - targetextension ".exe" - -configuration { } - -strip() - --------------------------------------------------- -- split -------------------------------------------------- @@ -758,15 +709,6 @@ files { configuration { "mingw*" or "vs*" } targetextension ".exe" --- workaround for https://developercommunity.visualstudio.com/content/problem/752372/vs2019-v1631-c-internal-compiler-error-when-zi-opt.html --- should be fixed in 16.5 -configuration { "Debug", "vs2019" } - if _OPTIONS["vs"]==nil then - flags { - "NoEditAndContinue", - } - end - configuration { } strip() diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index a1f5221b58a..db65b2da111 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -1150,6 +1150,8 @@ if (VIDEOS["PPU2C0X"]~=null) then MAME_DIR .. "src/devices/video/ppu2c0x.h", MAME_DIR .. "src/devices/video/ppu2c0x_vt.cpp", MAME_DIR .. "src/devices/video/ppu2c0x_vt.h", + MAME_DIR .. "src/devices/video/ppu2c0x_sh6578.cpp", + MAME_DIR .. "src/devices/video/ppu2c0x_sh6578.h", } end |