diff options
author | 2016-05-26 00:26:07 +1000 | |
---|---|---|
committer | 2016-05-26 00:26:07 +1000 | |
commit | 7e3fce4ba9ebd4e4dc6b53027e70653c656c643b (patch) | |
tree | 2add66db88bac7b2186e6fc89f843727f1b9907a /docs/release/scripts | |
parent | 4772a2556d0f35de45d601bd604595279f250236 (diff) |
0.174 Release Fileshbmame174
Diffstat (limited to 'docs/release/scripts')
24 files changed, 715 insertions, 422 deletions
diff --git a/docs/release/scripts/build/makedep.py b/docs/release/scripts/build/makedep.py index 2ce47d42cd0..b1278879d77 100644 --- a/docs/release/scripts/build/makedep.py +++ b/docs/release/scripts/build/makedep.py @@ -160,7 +160,9 @@ def parse_file(root, srcfile, folder): files_included.append(fullname) newfolder = fullname.rsplit('/', 1)[0] + '/' parse_file(root, fullname, newfolder) - if (fullname.endswith('.h')): + if (fullname.endswith('.h') and not("src/emu" in fullname) and not("src/devices" in fullname) and not("src/lib" in fullname) and not("src/osd" in fullname)): + parse_file_for_deps(root, fullname.replace('.h','.cpp'), newfolder) + elif fullname.endswith('.h'): parse_file(root, fullname.replace('.h','.cpp'), newfolder) continue fp.close() diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 3281ca7813b..cfb30ed95d8 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -1,5 +1,6 @@ -- license:BSD-3-Clause -- copyright-holders:MAMEdev Team +STANDALONE = false newoption { trigger = 'build-dir', @@ -553,7 +554,7 @@ configuration { "Debug" } defines { "MAME_DEBUG", "MAME_PROFILER", - "BGFX_CONFIG_DEBUG=1", +-- "BGFX_CONFIG_DEBUG=1", } if _OPTIONS["FASTDEBUG"]=="1" then @@ -1317,14 +1318,18 @@ group "core" dofile(path.join("src", "emu.lua")) -dofile(path.join("src", "mame", "frontend.lua")) +if (STANDALONE~=true) then + dofile(path.join("src", "mame", "frontend.lua")) +end group "devices" dofile(path.join("src", "devices.lua")) devicesProject(_OPTIONS["target"],_OPTIONS["subtarget"]) -group "drivers" -findfunction("createProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"]) +if (STANDALONE~=true) then + group "drivers" + findfunction("createProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"]) +end group "emulator" dofile(path.join("src", "main.lua")) diff --git a/docs/release/scripts/resources/emscripten/emscripten_post.js b/docs/release/scripts/resources/emscripten/emscripten_post.js index aa7dac53894..92cbdd21f9b 100644 --- a/docs/release/scripts/resources/emscripten/emscripten_post.js +++ b/docs/release/scripts/resources/emscripten/emscripten_post.js @@ -7,4 +7,5 @@ JSMAME.ui_set_show_fps = Module.cwrap('_ZN15mame_ui_manager12set_show_fpsEb', '' JSMAME.ui_get_show_fps = Module.cwrap('_ZNK15mame_ui_manager8show_fpsEv', 'number', ['number']); JSMAME.sound_manager_mute = Module.cwrap('_ZN13sound_manager4muteEbh', '', ['number', 'number', 'number']); JSMAME.sdl_pauseaudio = Module.cwrap('SDL_PauseAudio', '', ['number']); +JSMAME.sdl_sendkeyboardkey = Module.cwrap('SDL_SendKeyboardKey', '', ['number', 'number']); var JSMESS = JSMAME; diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 26d5c687cd0..664898d114e 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -811,6 +811,7 @@ end if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then buildoptions { "-Wno-switch", + "-Wno-unknown-pragmas", } end end @@ -1213,6 +1214,15 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", } end + if _OPTIONS["targetos"]=="netbsd" then + files { + MAME_DIR .. "3rdparty/libuv/src/unix/netbsd.c", + MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", + } + links { + "kvm", + } + end if (_OPTIONS["SHADOW_CHECK"]=="1") then removebuildoptions { diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index c525ce46732..3da1e88cb3c 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -479,6 +479,7 @@ end --------------------------------------------------- -- --@src/devices/bus/coleco/ctrl.h,BUSES["COLECO"] = true +--@src/devices/bus/coleco/exp.h,BUSES["COLECO"] = true --------------------------------------------------- if (BUSES["COLECO"]~=null) then @@ -516,7 +517,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/dmv/dmv.h,BUSES["DMV"] = true +--@src/devices/bus/dmv/dmvbus.h,BUSES["DMV"] = true --------------------------------------------------- if (BUSES["DMV"]~=null) then @@ -671,7 +672,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/isbx/isbx.h,BUSES["IMI7000"] = true +--@src/devices/bus/imi7000/imi7000.h,BUSES["IMI7000"] = true --------------------------------------------------- if (BUSES["IMI7000"]~=null) then @@ -1188,7 +1189,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/vcs/ctrl.h,BUSES["VCS_CTRL"] = true +--@src/devices/bus/vcs_ctrl/ctrl.h,BUSES["VCS_CTRL"] = true --------------------------------------------------- if (BUSES["VCS_CTRL"]~=null) then @@ -1633,9 +1634,9 @@ if (BUSES["NES"]~=null) then files { MAME_DIR .. "src/devices/bus/nes/nes_slot.cpp", MAME_DIR .. "src/devices/bus/nes/nes_slot.h", - MAME_DIR .. "src/devices/bus/nes/nes_ines.inc", - MAME_DIR .. "src/devices/bus/nes/nes_pcb.inc", - MAME_DIR .. "src/devices/bus/nes/nes_unif.inc", + MAME_DIR .. "src/devices/bus/nes/nes_ines.hxx", + MAME_DIR .. "src/devices/bus/nes/nes_pcb.hxx", + MAME_DIR .. "src/devices/bus/nes/nes_unif.hxx", MAME_DIR .. "src/devices/bus/nes/nes_carts.cpp", MAME_DIR .. "src/devices/bus/nes/nes_carts.h", MAME_DIR .. "src/devices/bus/nes/2a03pur.cpp", @@ -1886,65 +1887,69 @@ end --------------------------------------------------- -- ---@src/devices/bus/neogeo/neogeo_slot.h,BUSES["NEOGEO"] = true +--@src/devices/bus/neogeo/slot.h,BUSES["NEOGEO"] = true --------------------------------------------------- if (BUSES["NEOGEO"]~=null) then files { - MAME_DIR .. "src/devices/bus/neogeo/neogeo_slot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_slot.h", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_intf.cpp", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_intf.h", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_carts.cpp", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_carts.h", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_helper.cpp", - MAME_DIR .. "src/devices/bus/neogeo/neogeo_helper.h", - MAME_DIR .. "src/devices/bus/neogeo/banked_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/banked_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/mslugx_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/mslugx_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/mslugx_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/mslugx_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/sma_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/sma_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/sma_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/sma_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/cmc_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/cmc_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/cmc_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/cmc_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/pcm2_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/pcm2_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/pcm2_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/pcm2_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/kof2002_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/kof2002_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/kof2002_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/kof2002_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/pvc_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/pvc_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/pvc_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/pvc_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/fatfury2_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/fatfury2_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/fatfury2_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/fatfury2_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/kof98_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/kof98_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/kof98_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/kof98_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/bootleg_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/bootleg_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/bootleg_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/bootleg_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/bootleg_hybrid_cart.cpp", - MAME_DIR .. "src/devices/bus/neogeo/bootleg_hybrid_cart.h", - MAME_DIR .. "src/devices/bus/neogeo/sbp_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/sbp_prot.h", - MAME_DIR .. "src/devices/bus/neogeo/kog_prot.cpp", - MAME_DIR .. "src/devices/bus/neogeo/kog_prot.h", + MAME_DIR .. "src/devices/bus/neogeo/slot.cpp", + MAME_DIR .. "src/devices/bus/neogeo/slot.h", + MAME_DIR .. "src/devices/bus/neogeo/carts.cpp", + MAME_DIR .. "src/devices/bus/neogeo/carts.h", MAME_DIR .. "src/devices/bus/neogeo/rom.cpp", MAME_DIR .. "src/devices/bus/neogeo/rom.h", + MAME_DIR .. "src/devices/bus/neogeo/fatfury2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/fatfury2.h", + MAME_DIR .. "src/devices/bus/neogeo/kof98.cpp", + MAME_DIR .. "src/devices/bus/neogeo/kof98.h", + MAME_DIR .. "src/devices/bus/neogeo/mslugx.cpp", + MAME_DIR .. "src/devices/bus/neogeo/mslugx.h", + MAME_DIR .. "src/devices/bus/neogeo/cmc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/cmc.h", + MAME_DIR .. "src/devices/bus/neogeo/sma.cpp", + MAME_DIR .. "src/devices/bus/neogeo/sma.h", + MAME_DIR .. "src/devices/bus/neogeo/pcm2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/pcm2.h", + MAME_DIR .. "src/devices/bus/neogeo/kof2k2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/kof2k2.h", + MAME_DIR .. "src/devices/bus/neogeo/pvc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/pvc.h", + MAME_DIR .. "src/devices/bus/neogeo/boot_cthd.cpp", + MAME_DIR .. "src/devices/bus/neogeo/boot_cthd.h", + MAME_DIR .. "src/devices/bus/neogeo/boot_misc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/boot_misc.h", + MAME_DIR .. "src/devices/bus/neogeo/boot_svc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/boot_svc.h", + MAME_DIR .. "src/devices/bus/neogeo/boot_kof2k2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/boot_kof2k2.h", + MAME_DIR .. "src/devices/bus/neogeo/boot_kof2k3.cpp", + MAME_DIR .. "src/devices/bus/neogeo/boot_kof2k3.h", + MAME_DIR .. "src/devices/bus/neogeo/sbp.cpp", + MAME_DIR .. "src/devices/bus/neogeo/sbp.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_fatfury2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_fatfury2.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_kof98.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_kof98.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_mslugx.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_mslugx.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_cmc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_cmc.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_sma.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_sma.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_pcm2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_pcm2.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_kof2k2.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_kof2k2.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_pvc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_pvc.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_cthd.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_cthd.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_kof2k3bl.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_kof2k3bl.h", + MAME_DIR .. "src/devices/bus/neogeo/boot_kof10th.cpp", + MAME_DIR .. "src/devices/bus/neogeo/boot_kof10th.h", + MAME_DIR .. "src/devices/bus/neogeo/prot_misc.cpp", + MAME_DIR .. "src/devices/bus/neogeo/prot_misc.h", } end @@ -2082,6 +2087,10 @@ end --------------------------------------------------- -- --@src/devices/bus/ti99x/990_dk.h,BUSES["TI99X"] = true +--@src/devices/bus/ti99x/990_tap.h,BUSES["TI99X"] = true +--@src/devices/bus/ti99x/990_hd.h,BUSES["TI99X"] = true +--@src/devices/bus/ti99x/genboard.h,BUSES["TI99X"] = true +--@src/devices/bus/ti99x/joyport.h,BUSES["TI99X"] = true --------------------------------------------------- if (BUSES["TI99X"]~=null) then @@ -2352,7 +2361,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/compucolor/compclr_flp.h,BUSES["COMPUCOLOR"] = true +--@src/devices/bus/compucolor/floppy.h,BUSES["COMPUCOLOR"] = true --------------------------------------------------- if (BUSES["COMPUCOLOR"]~=null) then files { @@ -2596,7 +2605,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/cgenie/expansion.h,BUSES["CGENIE_EXPANSION"] = true +--@src/devices/bus/cgenie/expansion/expansion.h,BUSES["CGENIE_EXPANSION"] = true --------------------------------------------------- if (BUSES["CGENIE_EXPANSION"]~=null) then @@ -2612,7 +2621,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/cgenie/parallel.h,BUSES["CGENIE_PARALLEL"] = true +--@src/devices/bus/cgenie/parallel/parallel.h,BUSES["CGENIE_PARALLEL"] = true --------------------------------------------------- if (BUSES["CGENIE_PARALLEL"]~=null) then diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 2590dea1c93..bb630af1e5c 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -73,7 +73,7 @@ end -------------------------------------------------- -- ARcompact (ARCtangent-A5, ARC 600, ARC 700) ---@src/devices/cpu/arc/arc.h,CPUS["ARCOMPACT"] = true +--@src/devices/cpu/arcompact/arcompact.h,CPUS["ARCOMPACT"] = true -------------------------------------------------- if (CPUS["ARCOMPACT"]~=null) then @@ -86,12 +86,12 @@ if (CPUS["ARCOMPACT"]~=null) then MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h", } dependency { - { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, - { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, + { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.hxx" }, + { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.hxx" }, } custombuildtask { - { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.inc", { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" }, {"@echo Generating arcompact source .inc files...", PYTHON .. " $(1) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.hxx", { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" }, {"@echo Generating ARCOMPACT source files...", PYTHON .. " $(1) $(@)" }}, } end @@ -129,10 +129,10 @@ if (CPUS["ARM7"]~=null) then MAME_DIR .. "src/devices/cpu/arm7/lpc210x.cpp", MAME_DIR .. "src/devices/cpu/arm7/lpc210x.h", MAME_DIR .. "src/devices/cpu/arm7/arm7core.h", - MAME_DIR .. "src/devices/cpu/arm7/arm7core.inc", - MAME_DIR .. "src/devices/cpu/arm7/arm7drc.inc", + MAME_DIR .. "src/devices/cpu/arm7/arm7core.hxx", + MAME_DIR .. "src/devices/cpu/arm7/arm7drc.hxx", MAME_DIR .. "src/devices/cpu/arm7/arm7help.h", - MAME_DIR .. "src/devices/cpu/arm7/arm7tdrc.inc", + MAME_DIR .. "src/devices/cpu/arm7/arm7tdrc.hxx", } end @@ -198,7 +198,7 @@ if (CPUS["ADSP21XX"]~=null) then files { MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.cpp", MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.h", - MAME_DIR .. "src/devices/cpu/adsp2100/2100ops.inc", + MAME_DIR .. "src/devices/cpu/adsp2100/2100ops.hxx", } end @@ -215,12 +215,12 @@ if (CPUS["ADSP21062"]~=null) then files { MAME_DIR .. "src/devices/cpu/sharc/sharc.cpp", MAME_DIR .. "src/devices/cpu/sharc/sharc.h", - MAME_DIR .. "src/devices/cpu/sharc/compute.inc", - MAME_DIR .. "src/devices/cpu/sharc/sharcdma.inc", + MAME_DIR .. "src/devices/cpu/sharc/compute.hxx", + MAME_DIR .. "src/devices/cpu/sharc/sharcdma.hxx", MAME_DIR .. "src/devices/cpu/sharc/sharcdsm.h", - MAME_DIR .. "src/devices/cpu/sharc/sharcmem.inc", + MAME_DIR .. "src/devices/cpu/sharc/sharcmem.hxx", MAME_DIR .. "src/devices/cpu/sharc/sharcops.h", - MAME_DIR .. "src/devices/cpu/sharc/sharcops.inc", + MAME_DIR .. "src/devices/cpu/sharc/sharcops.hxx", } end @@ -253,7 +253,7 @@ if (CPUS["DSP16A"]~=null) then files { MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp", MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h", - MAME_DIR .. "src/devices/cpu/dsp16/dsp16ops.inc", + MAME_DIR .. "src/devices/cpu/dsp16/dsp16ops.hxx", } end @@ -270,7 +270,7 @@ if (CPUS["DSP32C"]~=null) then files { MAME_DIR .. "src/devices/cpu/dsp32/dsp32.cpp", MAME_DIR .. "src/devices/cpu/dsp32/dsp32.h", - MAME_DIR .. "src/devices/cpu/dsp32/dsp32ops.inc", + MAME_DIR .. "src/devices/cpu/dsp32/dsp32ops.hxx", } end @@ -382,7 +382,7 @@ if (CPUS["E0C6200"]~=null) then MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200.h", MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.cpp", MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.h", - MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200op.inc", + MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200op.cpp", } end @@ -415,7 +415,7 @@ if (CPUS["COP400"]~=null) then files { MAME_DIR .. "src/devices/cpu/cop400/cop400.cpp", MAME_DIR .. "src/devices/cpu/cop400/cop400.h", - MAME_DIR .. "src/devices/cpu/cop400/cop400op.inc", + MAME_DIR .. "src/devices/cpu/cop400/cop400op.hxx", } end @@ -466,8 +466,8 @@ if (CPUS["T11"]~=null) then files { MAME_DIR .. "src/devices/cpu/t11/t11.cpp", MAME_DIR .. "src/devices/cpu/t11/t11.h", - MAME_DIR .. "src/devices/cpu/t11/t11ops.inc", - MAME_DIR .. "src/devices/cpu/t11/t11table.inc", + MAME_DIR .. "src/devices/cpu/t11/t11ops.hxx", + MAME_DIR .. "src/devices/cpu/t11/t11table.hxx", } end @@ -566,30 +566,36 @@ if (CPUS["H8"]~=null) then MAME_DIR .. "src/devices/cpu/h8/h8s2655.h", MAME_DIR .. "src/devices/cpu/h8/h8_adc.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_adc.h", - MAME_DIR .. "src/devices/cpu/h8/h8_port.cpp", - MAME_DIR .. "src/devices/cpu/h8/h8_port.h", + MAME_DIR .. "src/devices/cpu/h8/h8_dma.cpp", + MAME_DIR .. "src/devices/cpu/h8/h8_dma.h", + MAME_DIR .. "src/devices/cpu/h8/h8_dtc.cpp", + MAME_DIR .. "src/devices/cpu/h8/h8_dtc.h", MAME_DIR .. "src/devices/cpu/h8/h8_intc.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_intc.h", + MAME_DIR .. "src/devices/cpu/h8/h8_port.cpp", + MAME_DIR .. "src/devices/cpu/h8/h8_port.h", MAME_DIR .. "src/devices/cpu/h8/h8_timer8.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_timer8.h", MAME_DIR .. "src/devices/cpu/h8/h8_timer16.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_timer16.h", MAME_DIR .. "src/devices/cpu/h8/h8_sci.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_sci.h", + MAME_DIR .. "src/devices/cpu/h8/h8_watchdog.cpp", + MAME_DIR .. "src/devices/cpu/h8/h8_watchdog.h", } dependency { - { MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.inc" }, - { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.inc" }, - { MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp", GEN_DIR .. "emu/cpu/h8/h8s2000.inc" }, - { MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp", GEN_DIR .. "emu/cpu/h8/h8s2600.inc" }, + { MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.hxx" }, + { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.hxx" }, + { MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp", GEN_DIR .. "emu/cpu/h8/h8s2000.hxx" }, + { MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp", GEN_DIR .. "emu/cpu/h8/h8s2600.hxx" }, } custombuildtask { - { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", PYTHON .. " $(1) $(<) o $(@)" }}, - { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", PYTHON .. " $(1) $(<) h $(@)" }}, - { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", PYTHON .. " $(1) $(<) s20 $(@)" }}, - { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", PYTHON .. " $(1) $(<) s26 $(@)" }}, + { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", PYTHON .. " $(1) $(<) o $(@)" }}, + { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", PYTHON .. " $(1) $(<) h $(@)" }}, + { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", PYTHON .. " $(1) $(<) s20 $(@)" }}, + { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", PYTHON .. " $(1) $(<) s26 $(@)" }}, } end @@ -713,7 +719,7 @@ if (CPUS["E1"]~=null) then files { MAME_DIR .. "src/devices/cpu/e132xs/e132xs.cpp", MAME_DIR .. "src/devices/cpu/e132xs/e132xs.h", - MAME_DIR .. "src/devices/cpu/e132xs/e132xsop.inc", + MAME_DIR .. "src/devices/cpu/e132xs/e132xsop.hxx", } end @@ -846,7 +852,7 @@ if (CPUS["MCS51"]~=null) then files { MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp", MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h", - MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.inc", + MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.hxx", } end @@ -869,15 +875,15 @@ if (CPUS["MCS96"]~=null) then MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.h", } dependency { - { MAME_DIR .. "src/devices/cpu/mcs96/mcs96.cpp", GEN_DIR .. "emu/cpu/mcs96/mcs96.inc" }, - { MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.cpp", GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc" }, - { MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.cpp", GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc" }, + { MAME_DIR .. "src/devices/cpu/mcs96/mcs96.cpp", GEN_DIR .. "emu/cpu/mcs96/mcs96.hxx" }, + { MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.cpp", GEN_DIR .. "emu/cpu/mcs96/i8x9x.hxx" }, + { MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.cpp", GEN_DIR .. "emu/cpu/mcs96/i8xc196.hxx" }, } custombuildtask { - { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.inc", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", PYTHON .. " $(1) mcs96 $(<) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", PYTHON .. " $(1) i8x9x $(<) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", PYTHON .. " $(1) i8xc196 $(<) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.hxx", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", PYTHON .. " $(1) mcs96 $(<) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.hxx", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", PYTHON .. " $(1) i8x9x $(<) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.hxx", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", PYTHON .. " $(1) i8xc196 $(<) $(@)" }}, } end @@ -909,14 +915,14 @@ if (CPUS["I386"]~=null) then MAME_DIR .. "src/devices/cpu/i386/i386.cpp", MAME_DIR .. "src/devices/cpu/i386/i386.h", MAME_DIR .. "src/devices/cpu/i386/cycles.h", - MAME_DIR .. "src/devices/cpu/i386/i386op16.inc", - MAME_DIR .. "src/devices/cpu/i386/i386op32.inc", + MAME_DIR .. "src/devices/cpu/i386/i386op16.hxx", + MAME_DIR .. "src/devices/cpu/i386/i386op32.hxx", MAME_DIR .. "src/devices/cpu/i386/i386ops.h", - MAME_DIR .. "src/devices/cpu/i386/i386ops.inc", + MAME_DIR .. "src/devices/cpu/i386/i386ops.hxx", MAME_DIR .. "src/devices/cpu/i386/i386priv.h", - MAME_DIR .. "src/devices/cpu/i386/i486ops.inc", - MAME_DIR .. "src/devices/cpu/i386/pentops.inc", - MAME_DIR .. "src/devices/cpu/i386/x87ops.inc", + MAME_DIR .. "src/devices/cpu/i386/i486ops.hxx", + MAME_DIR .. "src/devices/cpu/i386/pentops.hxx", + MAME_DIR .. "src/devices/cpu/i386/x87ops.hxx", } end @@ -934,7 +940,7 @@ if (CPUS["I860"]~=null) then MAME_DIR .. "src/devices/cpu/i860/i860.cpp", MAME_DIR .. "src/devices/cpu/i860/i860.h", --MAME_DIR .. "src/devices/cpu/i860/i860dasm.cpp", - MAME_DIR .. "src/devices/cpu/i860/i860dec.inc", + MAME_DIR .. "src/devices/cpu/i860/i860dec.hxx", } end @@ -968,7 +974,7 @@ if (CPUS["LH5801"]~=null) then files { MAME_DIR .. "src/devices/cpu/lh5801/lh5801.cpp", MAME_DIR .. "src/devices/cpu/lh5801/lh5801.h", - MAME_DIR .. "src/devices/cpu/lh5801/5801tbl.inc", + MAME_DIR .. "src/devices/cpu/lh5801/5801tbl.hxx", } end @@ -1026,7 +1032,7 @@ end -------------------------------------------------- -- Fujitsu MB86235 ---@src/devices/cpu/mb86233/mb86235.h,CPUS["MB86235"] = true +--@src/devices/cpu/mb86235/mb86235.h,CPUS["MB86235"] = true -------------------------------------------------- if (CPUS["MB86235"]~=null) then @@ -1076,14 +1082,27 @@ end -------------------------------------------------- -- MIPS R3000 (MIPS I/II) series +--@src/devices/cpu/mips/r3000.h,CPUS["R3000"] = true +-------------------------------------------------- + +if (CPUS["R3000"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/mips/r3000.cpp", + MAME_DIR .. "src/devices/cpu/mips/r3000.h", + } +end + +if (CPUS["R3000"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.cpp") +end + +-------------------------------------------------- -- MIPS R4000 (MIPS III/IV) series --@src/devices/cpu/mips/mips3.h,CPUS["MIPS"] = true -------------------------------------------------- if (CPUS["MIPS"]~=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/mips3com.cpp", MAME_DIR .. "src/devices/cpu/mips/mips3com.h", MAME_DIR .. "src/devices/cpu/mips/mips3.cpp", @@ -1095,7 +1114,6 @@ if (CPUS["MIPS"]~=null) then end if (CPUS["MIPS"]~=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/mips3dsm.cpp") end @@ -1235,30 +1253,30 @@ if (CPUS["M6502"]~=null) then } dependency { - { MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp", GEN_DIR .. "emu/cpu/m6502/m6502.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp", GEN_DIR .. "emu/cpu/m6502/m65c02.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp", GEN_DIR .. "emu/cpu/m6502/m65ce02.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp", GEN_DIR .. "emu/cpu/m6502/m6509.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp", GEN_DIR .. "emu/cpu/m6502/m6510.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/n2a03.cpp", GEN_DIR .. "emu/cpu/m6502/n2a03.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02.inc" }, - { MAME_DIR .. "src/devices/cpu/m6502/m740.cpp", GEN_DIR .. "emu/cpu/m6502/m740.inc" }, + { MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp", GEN_DIR .. "emu/cpu/m6502/m6502.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp", GEN_DIR .. "emu/cpu/m6502/m65c02.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp", GEN_DIR .. "emu/cpu/m6502/m65ce02.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp", GEN_DIR .. "emu/cpu/m6502/m6509.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp", GEN_DIR .. "emu/cpu/m6502/m6510.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/n2a03.cpp", GEN_DIR .. "emu/cpu/m6502/n2a03.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6502/m740.cpp", GEN_DIR .. "emu/cpu/m6502/m740.hxx" }, } custombuildtask { - { MAME_DIR .. "src/devices/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", PYTHON .. " $(1) deco16_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", PYTHON .. " $(1) m4510_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", PYTHON .. " $(1) m6502_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", PYTHON .. " $(1) m65c02_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.inc",{ MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", PYTHON .. " $(1) m65ce02_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", PYTHON .. " $(1) m6509_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", PYTHON .. " $(1) m6510_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", PYTHON .. " $(1) n2a03_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", PYTHON .. " $(1) m740_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", PYTHON .. " $(1) deco16_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", PYTHON .. " $(1) m4510_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", PYTHON .. " $(1) m6502_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", PYTHON .. " $(1) m65c02_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.hxx",{ MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", PYTHON .. " $(1) m65ce02_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", PYTHON .. " $(1) m6509_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", PYTHON .. " $(1) m6510_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", PYTHON .. " $(1) n2a03_device $(<) $(2) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", PYTHON .. " $(1) m740_device $(<) $(2) $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", PYTHON .. " $(1) r65c02_device - $(<) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", PYTHON .. " $(1) r65c02_device - $(<) $(@)" }}, } end @@ -1271,8 +1289,8 @@ if (CPUS["M6800"]~=null) then files { MAME_DIR .. "src/devices/cpu/m6800/m6800.cpp", MAME_DIR .. "src/devices/cpu/m6800/m6800.h", - MAME_DIR .. "src/devices/cpu/m6800/6800ops.inc", - MAME_DIR .. "src/devices/cpu/m6800/6800tbl.inc", + MAME_DIR .. "src/devices/cpu/m6800/6800ops.hxx", + MAME_DIR .. "src/devices/cpu/m6800/6800tbl.hxx", } end @@ -1289,7 +1307,7 @@ if (CPUS["M6805"]~=null) then files { MAME_DIR .. "src/devices/cpu/m6805/m6805.cpp", MAME_DIR .. "src/devices/cpu/m6805/m6805.h", - MAME_DIR .. "src/devices/cpu/m6805/6805ops.inc", + MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx", } end @@ -1316,15 +1334,15 @@ if (CPUS["M6809"]~=null) then } dependency { - { MAME_DIR .. "src/devices/cpu/m6809/m6809.cpp", GEN_DIR .. "emu/cpu/m6809/m6809.inc" }, - { MAME_DIR .. "src/devices/cpu/m6809/hd6309.cpp", GEN_DIR .. "emu/cpu/m6809/hd6309.inc" }, - { MAME_DIR .. "src/devices/cpu/m6809/konami.cpp", GEN_DIR .. "emu/cpu/m6809/konami.inc" }, + { MAME_DIR .. "src/devices/cpu/m6809/m6809.cpp", GEN_DIR .. "emu/cpu/m6809/m6809.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6809/hd6309.cpp", GEN_DIR .. "emu/cpu/m6809/hd6309.hxx" }, + { MAME_DIR .. "src/devices/cpu/m6809/konami.cpp", GEN_DIR .. "emu/cpu/m6809/konami.hxx" }, } custombuildtask { - { MAME_DIR .. "src/devices/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.inc", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.inc", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }}, - { MAME_DIR .. "src/devices/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.inc", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.hxx", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.hxx", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.hxx", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }}, } end @@ -1344,7 +1362,7 @@ if (CPUS["MC68HC11"]~=null) then MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.cpp", MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.h", MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.h", - MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.inc", + MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.hxx", } end @@ -1364,7 +1382,7 @@ if (CPUS["M680X0"]~=null) then MAME_DIR .. "src/devices/cpu/m68000/m68kops.cpp", MAME_DIR .. "src/devices/cpu/m68000/m68kops.h", MAME_DIR .. "src/devices/cpu/m68000/m68000.h", - MAME_DIR .. "src/devices/cpu/m68000/m68kfpu.inc", + MAME_DIR .. "src/devices/cpu/m68000/m68kfpu.hxx", --MAME_DIR .. "src/devices/cpu/m68000/m68kmake.cpp", MAME_DIR .. "src/devices/cpu/m68000/m68kmmu.h", --MAME_DIR .. "src/devices/cpu/m68000/m68k_in.cpp", @@ -1389,7 +1407,7 @@ if (CPUS["DSP56156"]~=null) then MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.cpp", MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.h", MAME_DIR .. "src/devices/cpu/dsp56k/dsp56def.h", - MAME_DIR .. "src/devices/cpu/dsp56k/dsp56ops.inc", + MAME_DIR .. "src/devices/cpu/dsp56k/dsp56ops.hxx", MAME_DIR .. "src/devices/cpu/dsp56k/inst.h", MAME_DIR .. "src/devices/cpu/dsp56k/opcode.h", MAME_DIR .. "src/devices/cpu/dsp56k/pmove.h", @@ -1476,12 +1494,12 @@ if (CPUS["NEC"]~=null) then MAME_DIR .. "src/devices/cpu/nec/nec.h", MAME_DIR .. "src/devices/cpu/nec/necea.h", MAME_DIR .. "src/devices/cpu/nec/necinstr.h", - MAME_DIR .. "src/devices/cpu/nec/necinstr.inc", + MAME_DIR .. "src/devices/cpu/nec/necinstr.hxx", MAME_DIR .. "src/devices/cpu/nec/necmacro.h", MAME_DIR .. "src/devices/cpu/nec/necmodrm.h", MAME_DIR .. "src/devices/cpu/nec/necpriv.h", MAME_DIR .. "src/devices/cpu/nec/v25instr.h", - MAME_DIR .. "src/devices/cpu/nec/v25instr.inc", + MAME_DIR .. "src/devices/cpu/nec/v25instr.hxx", MAME_DIR .. "src/devices/cpu/nec/v25priv.h", MAME_DIR .. "src/devices/cpu/nec/v25.cpp", MAME_DIR .. "src/devices/cpu/nec/v25.h", @@ -1515,18 +1533,18 @@ if (CPUS["V60"]~=null) then files { MAME_DIR .. "src/devices/cpu/v60/v60.cpp", MAME_DIR .. "src/devices/cpu/v60/v60.h", - MAME_DIR .. "src/devices/cpu/v60/am.inc", - MAME_DIR .. "src/devices/cpu/v60/am1.inc", - MAME_DIR .. "src/devices/cpu/v60/am2.inc", - MAME_DIR .. "src/devices/cpu/v60/am3.inc", - MAME_DIR .. "src/devices/cpu/v60/op12.inc", - MAME_DIR .. "src/devices/cpu/v60/op2.inc", - MAME_DIR .. "src/devices/cpu/v60/op3.inc", - MAME_DIR .. "src/devices/cpu/v60/op4.inc", - MAME_DIR .. "src/devices/cpu/v60/op5.inc", - MAME_DIR .. "src/devices/cpu/v60/op6.inc", - MAME_DIR .. "src/devices/cpu/v60/op7a.inc", - MAME_DIR .. "src/devices/cpu/v60/optable.inc", + MAME_DIR .. "src/devices/cpu/v60/am.hxx", + MAME_DIR .. "src/devices/cpu/v60/am1.hxx", + MAME_DIR .. "src/devices/cpu/v60/am2.hxx", + MAME_DIR .. "src/devices/cpu/v60/am3.hxx", + MAME_DIR .. "src/devices/cpu/v60/op12.hxx", + MAME_DIR .. "src/devices/cpu/v60/op2.hxx", + MAME_DIR .. "src/devices/cpu/v60/op3.hxx", + MAME_DIR .. "src/devices/cpu/v60/op4.hxx", + MAME_DIR .. "src/devices/cpu/v60/op5.hxx", + MAME_DIR .. "src/devices/cpu/v60/op6.hxx", + MAME_DIR .. "src/devices/cpu/v60/op7a.hxx", + MAME_DIR .. "src/devices/cpu/v60/optable.hxx", } end @@ -1697,8 +1715,8 @@ if (CPUS["SATURN"]~=null) then files { MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp", MAME_DIR .. "src/devices/cpu/saturn/saturn.h", - MAME_DIR .. "src/devices/cpu/saturn/satops.inc", - MAME_DIR .. "src/devices/cpu/saturn/sattable.inc", + MAME_DIR .. "src/devices/cpu/saturn/satops.hxx", + MAME_DIR .. "src/devices/cpu/saturn/sattable.hxx", } end @@ -1775,8 +1793,8 @@ if (CPUS["SC61860"]~=null) then MAME_DIR .. "src/devices/cpu/sc61860/sc61860.cpp", MAME_DIR .. "src/devices/cpu/sc61860/sc61860.h", --MAME_DIR .. "src/devices/cpu/sc61860/readpc.cpp", - MAME_DIR .. "src/devices/cpu/sc61860/scops.inc", - MAME_DIR .. "src/devices/cpu/sc61860/sctable.inc", + MAME_DIR .. "src/devices/cpu/sc61860/scops.hxx", + MAME_DIR .. "src/devices/cpu/sc61860/sctable.hxx", } end @@ -1894,7 +1912,7 @@ if (CPUS["TMS7000"]~=null) then files { MAME_DIR .. "src/devices/cpu/tms7000/tms7000.cpp", MAME_DIR .. "src/devices/cpu/tms7000/tms7000.h", - MAME_DIR .. "src/devices/cpu/tms7000/tms70op.inc", + MAME_DIR .. "src/devices/cpu/tms7000/tms7000op.cpp", } end @@ -1907,6 +1925,7 @@ end --@src/devices/cpu/tms9900/tms9900.h,CPUS["TMS9900"] = true --@src/devices/cpu/tms9900/tms9980a.h,CPUS["TMS9900"] = true --@src/devices/cpu/tms9900/tms9995.h,CPUS["TMS9900"] = true +--@src/devices/cpu/tms9900/ti990_10.h,CPUS["TMS9900"] = true -------------------------------------------------- if (CPUS["TMS9900"]~=null) then @@ -1936,11 +1955,11 @@ if (CPUS["TMS340X0"]~=null) then files { MAME_DIR .. "src/devices/cpu/tms34010/tms34010.cpp", MAME_DIR .. "src/devices/cpu/tms34010/tms34010.h", - MAME_DIR .. "src/devices/cpu/tms34010/34010fld.inc", - MAME_DIR .. "src/devices/cpu/tms34010/34010gfx.inc", + MAME_DIR .. "src/devices/cpu/tms34010/34010fld.hxx", + MAME_DIR .. "src/devices/cpu/tms34010/34010gfx.hxx", MAME_DIR .. "src/devices/cpu/tms34010/34010ops.h", - MAME_DIR .. "src/devices/cpu/tms34010/34010ops.inc", - MAME_DIR .. "src/devices/cpu/tms34010/34010tbl.inc", + MAME_DIR .. "src/devices/cpu/tms34010/34010ops.hxx", + MAME_DIR .. "src/devices/cpu/tms34010/34010tbl.hxx", --MAME_DIR .. "src/devices/cpu/tms34010/dis34010.cpp", } end @@ -1992,7 +2011,7 @@ if (CPUS["TMS32031"]~=null) then files { MAME_DIR .. "src/devices/cpu/tms32031/tms32031.cpp", MAME_DIR .. "src/devices/cpu/tms32031/tms32031.h", - MAME_DIR .. "src/devices/cpu/tms32031/32031ops.inc", + MAME_DIR .. "src/devices/cpu/tms32031/32031ops.hxx", } end @@ -2010,7 +2029,7 @@ if (CPUS["TMS32051"]~=null) then MAME_DIR .. "src/devices/cpu/tms32051/tms32051.cpp", MAME_DIR .. "src/devices/cpu/tms32051/tms32051.h", MAME_DIR .. "src/devices/cpu/tms32051/32051ops.h", - MAME_DIR .. "src/devices/cpu/tms32051/32051ops.inc", + MAME_DIR .. "src/devices/cpu/tms32051/32051ops.hxx", } end @@ -2048,18 +2067,18 @@ if (CPUS["TMS57002"]~=null) then MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", } dependency { - { MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" }, - { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" }, + { 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" }, } custombuildtask { - { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } } + { 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) $(<) $(@)" } } } end if (CPUS["TMS57002"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp") - table.insert(disasm_dependency , { MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" } ) - table.insert(disasm_custombuildtask , { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" }}) + table.insert(disasm_dependency , { MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" } ) + table.insert(disasm_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) $(<) $(@)" }}) end -------------------------------------------------- @@ -2083,7 +2102,7 @@ if (CPUS["TLCS900"]~=null) then files { MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.cpp", MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.h", - MAME_DIR .. "src/devices/cpu/tlcs900/900tbl.inc", + MAME_DIR .. "src/devices/cpu/tlcs900/900tbl.hxx", } end @@ -2125,8 +2144,8 @@ if (CPUS["LR35902"]~=null) then files { MAME_DIR .. "src/devices/cpu/lr35902/lr35902.cpp", MAME_DIR .. "src/devices/cpu/lr35902/lr35902.h", - MAME_DIR .. "src/devices/cpu/lr35902/opc_cb.inc", - MAME_DIR .. "src/devices/cpu/lr35902/opc_main.inc", + MAME_DIR .. "src/devices/cpu/lr35902/opc_cb.hxx", + MAME_DIR .. "src/devices/cpu/lr35902/opc_main.hxx", } end @@ -2143,14 +2162,14 @@ if (CPUS["Z180"]~=null) then files { MAME_DIR .. "src/devices/cpu/z180/z180.cpp", MAME_DIR .. "src/devices/cpu/z180/z180.h", - MAME_DIR .. "src/devices/cpu/z180/z180cb.inc", - MAME_DIR .. "src/devices/cpu/z180/z180dd.inc", - MAME_DIR .. "src/devices/cpu/z180/z180ed.inc", - MAME_DIR .. "src/devices/cpu/z180/z180fd.inc", - MAME_DIR .. "src/devices/cpu/z180/z180op.inc", + MAME_DIR .. "src/devices/cpu/z180/z180cb.hxx", + MAME_DIR .. "src/devices/cpu/z180/z180dd.hxx", + MAME_DIR .. "src/devices/cpu/z180/z180ed.hxx", + MAME_DIR .. "src/devices/cpu/z180/z180fd.hxx", + MAME_DIR .. "src/devices/cpu/z180/z180op.hxx", MAME_DIR .. "src/devices/cpu/z180/z180ops.h", MAME_DIR .. "src/devices/cpu/z180/z180tbl.h", - MAME_DIR .. "src/devices/cpu/z180/z180xy.inc", + MAME_DIR .. "src/devices/cpu/z180/z180xy.hxx", MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp", MAME_DIR .. "src/devices/cpu/z80/z80daisy.h", } @@ -2172,8 +2191,8 @@ if (CPUS["Z8000"]~=null) then --MAME_DIR .. "src/devices/cpu/z8000/makedab.cpp", MAME_DIR .. "src/devices/cpu/z8000/z8000cpu.h", MAME_DIR .. "src/devices/cpu/z8000/z8000dab.h", - MAME_DIR .. "src/devices/cpu/z8000/z8000ops.inc", - MAME_DIR .. "src/devices/cpu/z8000/z8000tbl.inc", + MAME_DIR .. "src/devices/cpu/z8000/z8000ops.hxx", + MAME_DIR .. "src/devices/cpu/z8000/z8000tbl.hxx", } end @@ -2190,7 +2209,7 @@ if (CPUS["Z8"]~=null) then files { MAME_DIR .. "src/devices/cpu/z8/z8.cpp", MAME_DIR .. "src/devices/cpu/z8/z8.h", - MAME_DIR .. "src/devices/cpu/z8/z8ops.inc", + MAME_DIR .. "src/devices/cpu/z8/z8ops.hxx", } end diff --git a/docs/release/scripts/src/devices.lua b/docs/release/scripts/src/devices.lua index 1248bcc0fe5..cbdb046f397 100644 --- a/docs/release/scripts/src/devices.lua +++ b/docs/release/scripts/src/devices.lua @@ -19,9 +19,12 @@ function devicesProject(_target, _subtarget) uuid (os.uuid("optional-" .. _target .."_" .. _subtarget)) kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) - options { - "ArchiveSplit", - } + + if (_OPTIONS["targetos"] ~= "asmjs") then + options { + "ArchiveSplit", + } + end addprojectflags() precompiledheaders() diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index 2fdefe75e3e..2449faa0ae5 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -10,7 +10,6 @@ --------------------------------------------------------------------------- project ("emu") -targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid ("e6fa15e4-a354-4526-acef-13c8e80fcacf") kind (LIBTYPE) @@ -173,7 +172,7 @@ files { MAME_DIR .. "src/emu/validity.h", MAME_DIR .. "src/emu/video.cpp", MAME_DIR .. "src/emu/video.h", - MAME_DIR .. "src/emu/rendersw.inc", + MAME_DIR .. "src/emu/rendersw.hxx", MAME_DIR .. "src/emu/ui/uimain.h", MAME_DIR .. "src/emu/ui/cmdrender.h", -- TODO: remove MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove @@ -265,7 +264,6 @@ custombuildtask { } project ("precompile") -targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid ("a6fb15d4-b123-4445-acef-13c8e80fcacf") kind (LIBTYPE) diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 1eb90f5a81a..61fba0708e9 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -1591,6 +1591,7 @@ end --------------------------------------------------- -- --@src/devices/machine/mos6530.h,MACHINES["MIOT6530"] = true +--@src/devices/machine/mos6530n.h,MACHINES["MIOT6530"] = true --------------------------------------------------- if (MACHINES["MIOT6530"]~=null) then @@ -1736,6 +1737,8 @@ if (MACHINES["PCI"]~=null) then MAME_DIR .. "src/devices/machine/pci-usb.h", MAME_DIR .. "src/devices/machine/pci-sata.cpp", MAME_DIR .. "src/devices/machine/pci-sata.h", + MAME_DIR .. "src/devices/machine/pci-ide.cpp", + MAME_DIR .. "src/devices/machine/pci-ide.h", MAME_DIR .. "src/devices/machine/pci-apic.cpp", MAME_DIR .. "src/devices/machine/pci-apic.h", MAME_DIR .. "src/devices/machine/pci-smbus.cpp", @@ -1987,7 +1990,7 @@ if (MACHINES["S3C2400"]~=null) then files { MAME_DIR .. "src/devices/machine/s3c2400.cpp", MAME_DIR .. "src/devices/machine/s3c2400.h", - MAME_DIR .. "src/devices/machine/s3c24xx.inc", + MAME_DIR .. "src/devices/machine/s3c24xx.hxx", } end @@ -2000,7 +2003,7 @@ if (MACHINES["S3C2410"]~=null) then files { MAME_DIR .. "src/devices/machine/s3c2410.cpp", MAME_DIR .. "src/devices/machine/s3c2410.h", - MAME_DIR .. "src/devices/machine/s3c24xx.inc", + MAME_DIR .. "src/devices/machine/s3c24xx.hxx", } end @@ -2025,18 +2028,7 @@ if (MACHINES["S3C2440"]~=null) then files { MAME_DIR .. "src/devices/machine/s3c2440.cpp", MAME_DIR .. "src/devices/machine/s3c2440.h", - MAME_DIR .. "src/devices/machine/s3c24xx.inc", - } -end - ---------------------------------------------------- --- ---@src/devices/machine/saturn.h,MACHINES["SATURN"] = true ---------------------------------------------------- - -if (MACHINES["SATURN"]~=null) then - files { - MAME_DIR .. "src/devices/machine/saturn.cpp", + MAME_DIR .. "src/devices/machine/s3c24xx.hxx", } end @@ -2084,6 +2076,7 @@ end if (MACHINES["STVCD"]~=null) then files { MAME_DIR .. "src/devices/machine/stvcd.cpp", + MAME_DIR .. "src/devices/machine/stvcd.h", } end @@ -2285,8 +2278,6 @@ if (MACHINES["UPD765"]~=null) then files { MAME_DIR .. "src/devices/machine/upd765.cpp", MAME_DIR .. "src/devices/machine/upd765.h", - MAME_DIR .. "src/devices/machine/fdc_pll.cpp", - MAME_DIR .. "src/devices/machine/fdc_pll.h", } end @@ -2311,8 +2302,6 @@ if (MACHINES["WD_FDC"]~=null) then files { MAME_DIR .. "src/devices/machine/wd_fdc.cpp", MAME_DIR .. "src/devices/machine/wd_fdc.h", - MAME_DIR .. "src/devices/machine/fdc_pll.cpp", - MAME_DIR .. "src/devices/machine/fdc_pll.h", } end @@ -2561,7 +2550,7 @@ end --------------------------------------------------- -- ---@src/devices/machine/ncr5389.h,MACHINES["NCR5390"] = true +--@src/devices/machine/ncr5390.h,MACHINES["NCR5390"] = true --------------------------------------------------- if (MACHINES["NCR5390"]~=null) then @@ -2776,7 +2765,7 @@ end --------------------------------------------------- -- ---@src/emu/machine/pdc.h,MACHINES["PDC"] = true +--@src/devices/machine/pdc.h,MACHINES["PDC"] = true --------------------------------------------------- if (MACHINES["PDC"]~=null) then @@ -2800,7 +2789,7 @@ end --------------------------------------------------- -- ---@src/devices/machine/gen_latch.h,MACHINES["GEN_LATCH] = true +--@src/devices/machine/gen_latch.h,MACHINES["GEN_LATCH"] = true --------------------------------------------------- if (MACHINES["GEN_LATCH"]~=null) then @@ -2809,3 +2798,71 @@ if (MACHINES["GEN_LATCH"]~=null) then MAME_DIR .. "src/devices/machine/gen_latch.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/fdc_pll.h,MACHINES["FDC_PLL"] = true +--------------------------------------------------- + +if (MACHINES["FDC_PLL"]~=null) then + files { + MAME_DIR .. "src/devices/machine/fdc_pll.cpp", + MAME_DIR .. "src/devices/machine/fdc_pll.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/watchdog.h,MACHINES["WATCHDOG"] = true +--------------------------------------------------- + +if (MACHINES["WATCHDOG"]~=null) then + files { + MAME_DIR .. "src/devices/machine/watchdog.cpp", + MAME_DIR .. "src/devices/machine/watchdog.h", + } +end + + +--------------------------------------------------- +-- +--@src/devices/machine/smartmed.h,MACHINES["SMARTMEDIA"] = true +--------------------------------------------------- +if (MACHINES["SMARTMEDIA"]~=null) then + files { + MAME_DIR .. "src/devices/machine/smartmed.cpp", + MAME_DIR .. "src/devices/machine/smartmed.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/appldriv.h,MACHINES["APPLE_DRIVE"] = true +--------------------------------------------------- +if (MACHINES["APPLE_DRIVE"]~=null) then + files { + MAME_DIR .. "src/devices/machine/appldriv.cpp", + MAME_DIR .. "src/devices/machine/appldriv.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/applefdc.h,MACHINES["APPLE_FDC"] = true +--------------------------------------------------- +if (MACHINES["APPLE_FDC"]~=null) then + files { + MAME_DIR .. "src/devices/machine/applefdc.cpp", + MAME_DIR .. "src/devices/machine/applefdc.h", + } +end +--------------------------------------------------- +-- +--@src/devices/machine/sonydriv.h,MACHINES["SONY_DRIVE"] = true +--------------------------------------------------- +if (MACHINES["SONY_DRIVE"]~=null) then + files { + MAME_DIR .. "src/devices/machine/sonydriv.cpp", + MAME_DIR .. "src/devices/machine/sonydriv.h", + } +end diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index 56c93a996ee..31b9090d6b1 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -115,21 +115,30 @@ end targetextension ".bc" if os.getenv("EMSCRIPTEN") then local emccopts = "" - emccopts = emccopts .. " -O3" - emccopts = emccopts .. " -s USE_SDL=2" - emccopts = emccopts .. " -s USE_SDL_TTF=2" - emccopts = emccopts .. " --memory-init-file 0" - emccopts = emccopts .. " -s ALLOW_MEMORY_GROWTH=0" - emccopts = emccopts .. " -s TOTAL_MEMORY=268435456" - emccopts = emccopts .. " -s DISABLE_EXCEPTION_CATCHING=2" - emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\",\"__ZN12cli_frontend7executeEiPPc\"]'" - emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\"" - emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" - emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" + .. " -O3" + .. " -s USE_SDL=2" + .. " -s USE_SDL_TTF=2" + .. " --memory-init-file 0" + .. " -s ALLOW_MEMORY_GROWTH=0" + .. " -s TOTAL_MEMORY=268435456" + .. " -s DISABLE_EXCEPTION_CATCHING=2" + .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\",\"__ZN12cli_frontend7executeEiPPc\"]'" + .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio', '_SDL_SendKeyboardKey']\"" + .. " --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" + .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects" + .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles" + .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" + + if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then + emccopts = emccopts .. " -g" .. _OPTIONS["SYMLEVEL"] + end + + if _OPTIONS["ARCHOPTS"] then + emccopts = emccopts .. " " .. _OPTIONS["ARCHOPTS"] + end + postbuildcommands { os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", } @@ -182,15 +191,21 @@ end end end +if (STANDALONE~=true) then findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"]) +end links { "osd_" .. _OPTIONS["osd"], } links { "qtdbg_" .. _OPTIONS["osd"], } +if (STANDALONE~=true) then links { "frontend", + } +end + links { "netlist", "optional", "emu", @@ -251,6 +266,12 @@ end ext_includedir("flac"), } + +if (STANDALONE==true) then + standalone(); +end + +if (STANDALONE~=true) then if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist" @@ -295,42 +316,42 @@ end GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", } -if (_OPTIONS["SOURCES"] == nil) then + if (_OPTIONS["SOURCES"] == nil) then - if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then - dependency { - { - GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, - } - custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, - } - else - if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then + if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then + dependency { + { + GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, } else + if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + } + else + dependency { + { + GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + } + end + end + end + + if (_OPTIONS["SOURCES"] ~= nil) then dependency { { - GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, } custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, } - end end -end - -if (_OPTIONS["SOURCES"] ~= nil) then - dependency { - { - GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, - } - custombuildtask { - { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, - } -end configuration { "mingw*" } custombuildtask { @@ -343,6 +364,7 @@ end "@echo Emitting ".. rctarget .. "vers.rc...", PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , } +end configuration { } diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index 2e4a35bf8a9..ea9bb933cfc 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -10,15 +10,18 @@ --------------------------------------------------------------------------- project ("frontend") -targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid ("e98e14c4-82a4-4988-ba29-01c90c817ab8") kind (LIBTYPE) addprojectflags() precompiledheaders() -options { - "ArchiveSplit", -} + +if (_OPTIONS["targetos"] ~= "asmjs") then + options { + "ArchiveSplit", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua index cb389db8d8d..aa00ec2c194 100644 --- a/docs/release/scripts/src/netlist.lua +++ b/docs/release/scripts/src/netlist.lua @@ -86,28 +86,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_4020.h", MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_4066.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7402.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7402.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7404.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7404.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7408.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7408.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7410.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7410.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7411.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7411.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7420.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7420.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7425.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7425.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7427.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7427.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7430.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7430.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7432.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7432.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7437.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7437.h", MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_7448.h", MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp", @@ -116,8 +94,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_7474.h", MAME_DIR .. "src/lib/netlist/devices/nld_7483.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_7483.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7486.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7486.h", MAME_DIR .. "src/lib/netlist/devices/nld_7490.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_7490.h", MAME_DIR .. "src/lib/netlist/devices/nld_7493.cpp", @@ -161,7 +137,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_system.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_system.h", MAME_DIR .. "src/lib/netlist/devices/nld_cmos.h", - MAME_DIR .. "src/lib/netlist/devices/nld_signal.h", MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h", MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp", diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index fef235457fe..a05e55ee4c6 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -57,7 +57,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/diagnostics/none.cpp", MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp", MAME_DIR .. "src/osd/modules/debugger/none.cpp", - MAME_DIR .. "src/osd/modules/debugger/debugint.cpp", MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp", MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp", MAME_DIR .. "src/osd/modules/font/font_sdl.cpp", @@ -114,9 +113,6 @@ function osdmodulesbuild() ext_includedir("uv"), } - includedirs { - MAME_DIR .. "src/frontend/mame", -- for internal debugger - } if _OPTIONS["targetos"]=="windows" then includedirs { MAME_DIR .. "3rdparty/winpcap/Include", diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua index a5527ef4b0d..a86228e7c4c 100644 --- a/docs/release/scripts/src/osd/newui.lua +++ b/docs/release/scripts/src/osd/newui.lua @@ -125,9 +125,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", - } - - includedirs { + MAME_DIR .. "src/frontend/mame", MAME_DIR .. "src/osd/windows", } diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index 263e4f42a74..1056384647d 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -106,7 +106,7 @@ project ("qtdbg_" .. _OPTIONS["osd"]) uuid (os.uuid("qtdbg_" .. _OPTIONS["osd"])) kind (LIBTYPE) - dofile("windows_cfg.lua") + dofile("winui_cfg.lua") includedirs { MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", -- accessing imagedev from debugger @@ -148,9 +148,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", - } - - includedirs { + MAME_DIR .. "src/frontend/mame", MAME_DIR .. "src/osd/windows", } diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua index 17f9c6aa2b2..2c54bf7f0f6 100644 --- a/docs/release/scripts/src/sound.lua +++ b/docs/release/scripts/src/sound.lua @@ -81,21 +81,21 @@ if (SOUNDS["DISCRETE"]~=null) then MAME_DIR .. "src/devices/sound/discrete.h", MAME_DIR .. "src/devices/sound/disc_cls.h", MAME_DIR .. "src/devices/sound/disc_dev.h", - MAME_DIR .. "src/devices/sound/disc_dev.inc", + MAME_DIR .. "src/devices/sound/disc_dev.hxx", MAME_DIR .. "src/devices/sound/disc_flt.h", - MAME_DIR .. "src/devices/sound/disc_flt.inc", - MAME_DIR .. "src/devices/sound/disc_inp.inc", + MAME_DIR .. "src/devices/sound/disc_flt.hxx", + MAME_DIR .. "src/devices/sound/disc_inp.hxx", MAME_DIR .. "src/devices/sound/disc_mth.h", - MAME_DIR .. "src/devices/sound/disc_mth.inc", - MAME_DIR .. "src/devices/sound/disc_sys.inc", + MAME_DIR .. "src/devices/sound/disc_mth.hxx", + MAME_DIR .. "src/devices/sound/disc_sys.hxx", MAME_DIR .. "src/devices/sound/disc_wav.h", - MAME_DIR .. "src/devices/sound/disc_wav.inc", + MAME_DIR .. "src/devices/sound/disc_wav.hxx", } end --------------------------------------------------- -- AC97 ---@src/devices/sound/pic-ac97.h,SOUNDS["AC97"] = true +--@src/devices/sound/pci-ac97.h,SOUNDS["AC97"] = true --------------------------------------------------- if (SOUNDS["AC97"]~=null) then @@ -650,9 +650,10 @@ end --@src/devices/sound/okim6376.h,SOUNDS["OKIM6376"] = true --@src/devices/sound/okim6295.h,SOUNDS["OKIM6295"] = true --@src/devices/sound/okim9810.h,SOUNDS["OKIM9810"] = true +--@src/devices/sound/okiadpcm.h,SOUNDS["OKIADPCM"] = true --------------------------------------------------- -if (SOUNDS["OKIM6258"]~=null or SOUNDS["OKIM6295"]~=null or SOUNDS["OKIM9810"]~=null or SOUNDS["I5000_SND"]~=null) then +if (SOUNDS["OKIM6258"]~=null or SOUNDS["OKIM6295"]~=null or SOUNDS["OKIM9810"]~=null or SOUNDS["I5000_SND"]~=null or SOUNDS["OKIADPCM"]~=null) then files { MAME_DIR .. "src/devices/sound/okiadpcm.cpp", MAME_DIR .. "src/devices/sound/okiadpcm.h", @@ -1013,7 +1014,7 @@ if (SOUNDS["TMS5110"]~=null) then files { MAME_DIR .. "src/devices/sound/tms5110.cpp", MAME_DIR .. "src/devices/sound/tms5110.h", - MAME_DIR .. "src/devices/sound/tms5110r.inc", + MAME_DIR .. "src/devices/sound/tms5110r.hxx", } end @@ -1025,7 +1026,7 @@ if (SOUNDS["TMS5220"]~=null) then files { MAME_DIR .. "src/devices/sound/tms5220.cpp", MAME_DIR .. "src/devices/sound/tms5220.h", - MAME_DIR .. "src/devices/sound/tms5110r.inc", + MAME_DIR .. "src/devices/sound/tms5110r.hxx", MAME_DIR .. "src/devices/machine/spchrom.cpp", MAME_DIR .. "src/devices/machine/spchrom.h", } @@ -1081,7 +1082,7 @@ if (SOUNDS["VLM5030"]~=null) then files { MAME_DIR .. "src/devices/sound/vlm5030.cpp", MAME_DIR .. "src/devices/sound/vlm5030.h", - MAME_DIR .. "src/devices/sound/tms5110r.inc", + MAME_DIR .. "src/devices/sound/tms5110r.hxx", } end @@ -1343,3 +1344,26 @@ if (SOUNDS["AD1848"]~=null) then MAME_DIR .. "src/devices/sound/ad1848.h", } end + +--------------------------------------------------- +-- UPD1771 +--@src/devices/sound/upd1771.h,SOUNDS["UPD1771"] = true +--------------------------------------------------- + +if (SOUNDS["UPD1771"]~=null) then + files { + MAME_DIR .. "src/devices/sound/upd1771.cpp", + MAME_DIR .. "src/devices/sound/upd1771.h", + } +end +--------------------------------------------------- +-- GB_SOUND +--@src/devices/sound/gb.h,SOUNDS["GB_SOUND"] = true +--------------------------------------------------- + +if (SOUNDS["GB_SOUND"]~=null) then + files { + MAME_DIR .. "src/devices/sound/gb.cpp", + MAME_DIR .. "src/devices/sound/gb.h", + } +end diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index 984bac6a950..2220e65fff9 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -203,8 +203,8 @@ if (VIDEOS["EPIC12"]~=null) then MAME_DIR .. "src/devices/video/epic12_blit6.cpp", MAME_DIR .. "src/devices/video/epic12_blit7.cpp", MAME_DIR .. "src/devices/video/epic12_blit8.cpp", - MAME_DIR .. "src/devices/video/epic12in.inc", - MAME_DIR .. "src/devices/video/epic12pixel.inc", + MAME_DIR .. "src/devices/video/epic12in.hxx", + MAME_DIR .. "src/devices/video/epic12pixel.hxx", } end @@ -246,18 +246,6 @@ end -------------------------------------------------- -- ---@src/devices/video/h63484.h,VIDEOS["H63484"] = true --------------------------------------------------- - -if (VIDEOS["H63484"]~=null) then - files { - MAME_DIR .. "src/devices/video/h63484.cpp", - MAME_DIR .. "src/devices/video/h63484.h", - } -end - --------------------------------------------------- --- --@src/devices/video/hd44102.h,VIDEOS["HD44102"] = true -------------------------------------------------- @@ -666,7 +654,9 @@ end if (VIDEOS["STVVDP"]~=null) then files { MAME_DIR .. "src/devices/video/stvvdp1.cpp", + MAME_DIR .. "src/devices/video/stvvdp1.h", MAME_DIR .. "src/devices/video/stvvdp2.cpp", + MAME_DIR .. "src/devices/video/stvvdp2.h", } end @@ -862,3 +852,15 @@ if (VIDEOS["JANGOU_BLITTER"]~=null) then MAME_DIR .. "src/devices/video/jangou_blitter.h", } end + +-------------------------------------------------- +-- +--@src/devices/video/gb_lcd.h,VIDEOS["GB_LCD"] = true +-------------------------------------------------- + +if (VIDEOS["GB_LCD"]~=null) then + files { + MAME_DIR .. "src/devices/video/gb_lcd.cpp", + MAME_DIR .. "src/devices/video/gb_lcd.h", + } +end diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua index 1ef6d7c7dc3..0b2b377152d 100644 --- a/docs/release/scripts/target/hbmame/hbmame.lua +++ b/docs/release/scripts/target/hbmame/hbmame.lua @@ -124,6 +124,7 @@ MACHINES["I2CMEM"] = true MACHINES["I8243"] = true MACHINES["I8255"] = true MACHINES["INTELFLASH"] = true +MACHINES["GEN_LATCH"] = true MACHINES["LATCH8"] = true MACHINES["LDPR8210"] = true MACHINES["MB14241"] = true @@ -136,6 +137,7 @@ MACHINES["TMS6100"] = true MACHINES["UPD1990A"] = true MACHINES["UPD4992"] = true MACHINES["V3021"] = true +MACHINES["WATCHDOG"] = true MACHINES["WD33C93"] = true MACHINES["WD_FDC"] = true MACHINES["Z80CTC"] = true @@ -147,8 +149,8 @@ MACHINES["Z80PIO"] = true -------------------------------------------------- BUSES["GENERIC"] = true -BUSES["NEOGEO"] = true -BUSES["NEOGEO_CTRL"] = true +-- BUSES["NEOGEO"] = true +-- BUSES["NEOGEO_CTRL"] = true BUSES["SCSI"] = true -------------------------------------------------- @@ -368,7 +370,7 @@ files { createHBMAMEProjects(_target, _subtarget, "itech") files { MAME_DIR .. "src/hbmame/drivers/itech8.cpp", - MAME_DIR .. "src/mame/machine/slikshot.cpp", + MAME_DIR .. "src/mame/machine/itech8.cpp", MAME_DIR .. "src/mame/video/itech8.cpp", } @@ -470,12 +472,78 @@ files { createHBMAMEProjects(_target, _subtarget, "neogeo") files { - MAME_DIR .. "src/mame/drivers/neogeo.cpp", - MAME_DIR .. "src/mame/video/neogeo.cpp", - MAME_DIR .. "src/mame/drivers/neogeo_noslot.cpp", - MAME_DIR .. "src/mame/video/neogeo_spr.cpp", - MAME_DIR .. "src/mame/machine/neocrypt.cpp", - MAME_DIR .. "src/mame/machine/ng_memcard.cpp", + MAME_DIR .. "src/hbmame/drivers/neogeo.cpp", + MAME_DIR .. "src/hbmame/video/neogeo.cpp", + MAME_DIR .. "src/hbmame/drivers/neogeo_noslot.cpp", + MAME_DIR .. "src/hbmame/video/neogeo_spr.cpp", + MAME_DIR .. "src/hbmame/machine/neocrypt.cpp", + MAME_DIR .. "src/hbmame/machine/ng_memcard.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_slot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_slot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_intf.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_intf.h", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_carts.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_carts.h", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_helper.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/neogeo_helper.h", + MAME_DIR .. "src/hbmame/bus/neogeo/banked_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/banked_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/mslugx_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/mslugx_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/mslugx_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/mslugx_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/sma_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/sma_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/sma_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/sma_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/cmc_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/cmc_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/cmc_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/cmc_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/pcm2_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/pcm2_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/pcm2_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/pcm2_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/kof2002_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/kof2002_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/kof2002_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/kof2002_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/pvc_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/pvc_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/pvc_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/pvc_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/fatfury2_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/fatfury2_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/fatfury2_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/fatfury2_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/kof98_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/kof98_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/kof98_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/kof98_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/bootleg_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/bootleg_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/bootleg_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/bootleg_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/bootleg_hybrid_cart.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/bootleg_hybrid_cart.h", + MAME_DIR .. "src/hbmame/bus/neogeo/sbp_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/sbp_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/kog_prot.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/kog_prot.h", + MAME_DIR .. "src/hbmame/bus/neogeo/rom.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo/rom.h", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/ctrl.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/ctrl.h", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/joystick.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/joystick.h", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/mahjong.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/mahjong.h", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/dial.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/dial.h", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/irrmaze.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/irrmaze.h", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/kizuna4p.cpp", + MAME_DIR .. "src/hbmame/bus/neogeo_ctrl/kizuna4p.h", } createHBMAMEProjects(_target, _subtarget, "nichibut") diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index ca5fc78e502..3c45c1f9d6d 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -58,6 +58,7 @@ CPUS["JAGUAR"] = true CPUS["CUBEQCPU"] = true CPUS["ESRIP"] = true CPUS["MIPS"] = true +CPUS["R3000"] = true CPUS["PSX"] = true CPUS["SH2"] = true CPUS["SH4"] = true @@ -259,6 +260,7 @@ SOUNDS["AC97"] = true SOUNDS["ES1373"] = true SOUNDS["L7A1045"] = true SOUNDS["AD1848"] = true +--SOUNDS["UPD1771"] = true -------------------------------------------------- -- specify available video cores @@ -283,7 +285,6 @@ VIDEOS["DM9368"] = true VIDEOS["GF7600GS"] = true VIDEOS["EPIC12"] = true VIDEOS["FIXFREQ"] = true -VIDEOS["H63484"] = true --VIDEOS["HD44102"] = true --VIDEOS["HD44352"] = true VIDEOS["HD44780"] = true @@ -539,6 +540,7 @@ MACHINES["UPD4701"] = true MACHINES["UPD7002"] = true MACHINES["UPD71071"] = true MACHINES["UPD765"] = true +MACHINES["FDC_PLL"] = true MACHINES["V3021"] = true MACHINES["WD_FDC"] = true MACHINES["WD11C00_17"] = true @@ -567,6 +569,7 @@ MACHINES["PCI9050"] = true --MACHINES["TMS1024"] = true MACHINES["GENPC"] = true MACHINES["GEN_LATCH"] = true +MACHINES["WATCHDOG"] = true -------------------------------------------------- -- specify available bus cores @@ -871,6 +874,7 @@ files { MAME_DIR .. "src/mame/machine/amiga.cpp", MAME_DIR .. "src/mame/video/amiga.cpp", MAME_DIR .. "src/mame/video/amigaaga.cpp", + MAME_DIR .. "src/mame/video/amigaaga.h", MAME_DIR .. "src/mame/drivers/arsystems.cpp", MAME_DIR .. "src/mame/drivers/cubo.cpp", MAME_DIR .. "src/mame/drivers/mquake.cpp", @@ -903,6 +907,7 @@ files { MAME_DIR .. "src/mame/machine/asteroid.cpp", MAME_DIR .. "src/mame/audio/asteroid.cpp", MAME_DIR .. "src/mame/audio/llander.cpp", + MAME_DIR .. "src/mame/audio/llander.h", MAME_DIR .. "src/mame/drivers/atarifb.cpp", MAME_DIR .. "src/mame/includes/atarifb.h", MAME_DIR .. "src/mame/machine/atarifb.cpp", @@ -1021,8 +1026,8 @@ files { MAME_DIR .. "src/mame/audio/jaguar.cpp", MAME_DIR .. "src/mame/video/jaguar.cpp", MAME_DIR .. "src/mame/video/jagblit.h", - MAME_DIR .. "src/mame/video/jagblit.inc", - MAME_DIR .. "src/mame/video/jagobj.inc", + MAME_DIR .. "src/mame/video/jagblit.hxx", + MAME_DIR .. "src/mame/video/jagobj.hxx", MAME_DIR .. "src/mame/drivers/jedi.cpp", MAME_DIR .. "src/mame/includes/jedi.h", MAME_DIR .. "src/mame/audio/jedi.cpp", @@ -1054,9 +1059,12 @@ files { MAME_DIR .. "src/mame/audio/orbit.cpp", MAME_DIR .. "src/mame/video/orbit.cpp", MAME_DIR .. "src/mame/drivers/pong.cpp", - MAME_DIR .. "src/mame/drivers/nl_pong.cpp", - MAME_DIR .. "src/mame/drivers/nl_pongd.cpp", - MAME_DIR .. "src/mame/drivers/nl_breakout.cpp", + MAME_DIR .. "src/mame/machine/nl_pong.cpp", + MAME_DIR .. "src/mame/machine/nl_pong.h", + MAME_DIR .. "src/mame/machine/nl_pongd.cpp", + MAME_DIR .. "src/mame/machine/nl_pongd.h", + MAME_DIR .. "src/mame/machine/nl_breakout.cpp", + MAME_DIR .. "src/mame/machine/nl_breakout.h", MAME_DIR .. "src/mame/drivers/poolshrk.cpp", MAME_DIR .. "src/mame/includes/poolshrk.h", MAME_DIR .. "src/mame/audio/poolshrk.cpp", @@ -1190,25 +1198,25 @@ createMAMEProjects(_target, _subtarget, "barcrest") files { MAME_DIR .. "src/mame/drivers/mpu2.cpp", MAME_DIR .. "src/mame/drivers/mpu3.cpp", - MAME_DIR .. "src/mame/drivers/mpu4hw.cpp", - MAME_DIR .. "src/mame/drivers/mpu4sw.cpp", MAME_DIR .. "src/mame/drivers/mpu4.cpp", + MAME_DIR .. "src/mame/drivers/mpu4sw.hxx", + MAME_DIR .. "src/mame/drivers/mpu4.hxx", MAME_DIR .. "src/mame/includes/mpu4.h", - MAME_DIR .. "src/mame/drivers/mpu4mod2sw.cpp", - MAME_DIR .. "src/mame/drivers/mpu4mod4yam.cpp", + MAME_DIR .. "src/mame/drivers/mpu4mod2sw.hxx", + MAME_DIR .. "src/mame/drivers/mpu4mod4yam.hxx", MAME_DIR .. "src/mame/drivers/mpu4plasma.cpp", MAME_DIR .. "src/mame/drivers/mpu4dealem.cpp", MAME_DIR .. "src/mame/drivers/mpu4vid.cpp", - MAME_DIR .. "src/mame/drivers/mpu4avan.cpp", - MAME_DIR .. "src/mame/drivers/mpu4union.cpp", - MAME_DIR .. "src/mame/drivers/mpu4concept.cpp", - MAME_DIR .. "src/mame/drivers/mpu4empire.cpp", - MAME_DIR .. "src/mame/drivers/mpu4mdm.cpp", - MAME_DIR .. "src/mame/drivers/mpu4crystal.cpp", - MAME_DIR .. "src/mame/drivers/mpu4bwb.cpp", - MAME_DIR .. "src/mame/drivers/mpu4misc.cpp", - MAME_DIR .. "src/mame/drivers/mpu5hw.cpp", + MAME_DIR .. "src/mame/drivers/mpu4avan.hxx", + MAME_DIR .. "src/mame/drivers/mpu4union.hxx", + MAME_DIR .. "src/mame/drivers/mpu4concept.hxx", + MAME_DIR .. "src/mame/drivers/mpu4empire.hxx", + MAME_DIR .. "src/mame/drivers/mpu4mdm.hxx", + MAME_DIR .. "src/mame/drivers/mpu4crystal.hxx", + MAME_DIR .. "src/mame/drivers/mpu4bwb.hxx", + MAME_DIR .. "src/mame/drivers/mpu4misc.hxx", MAME_DIR .. "src/mame/drivers/mpu5.cpp", + MAME_DIR .. "src/mame/drivers/mpu5.hxx", MAME_DIR .. "src/mame/video/awpvid.cpp", MAME_DIR .. "src/mame/video/awpvid.h", MAME_DIR .. "src/mame/machine/meters.cpp", @@ -1225,15 +1233,14 @@ files { MAME_DIR .. "src/mame/video/bfm_adr2.cpp", MAME_DIR .. "src/mame/video/bfm_adr2.h", MAME_DIR .. "src/mame/drivers/bfm_sc4.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc4h.cpp", MAME_DIR .. "src/mame/drivers/bfm_sc5.cpp", MAME_DIR .. "src/mame/includes/bfm_sc5.h", - MAME_DIR .. "src/mame/drivers/bfm_sc5sw.cpp", + MAME_DIR .. "src/mame/drivers/bfm_sc5.hxx", MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp", MAME_DIR .. "src/mame/includes/bfm_ad5.h", - MAME_DIR .. "src/mame/drivers/bfm_ad5sw.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.cpp", - MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.h", + MAME_DIR .. "src/mame/drivers/bfm_ad5.hxx", + MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp", + MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h", MAME_DIR .. "src/mame/includes/bfm_sc45.h", MAME_DIR .. "src/mame/drivers/bfm_swp.cpp", MAME_DIR .. "src/mame/drivers/bfmsys83.cpp", @@ -1452,6 +1459,7 @@ files { MAME_DIR .. "src/mame/video/deco_mlc.cpp", MAME_DIR .. "src/mame/drivers/deco156.cpp", MAME_DIR .. "src/mame/machine/deco156.cpp", + MAME_DIR .. "src/mame/machine/deco156.h", MAME_DIR .. "src/mame/drivers/deco32.cpp", MAME_DIR .. "src/mame/includes/deco32.h", MAME_DIR .. "src/mame/video/deco32.cpp", @@ -1545,8 +1553,9 @@ files { MAME_DIR .. "src/mame/includes/vaportra.h", MAME_DIR .. "src/mame/video/vaportra.cpp", MAME_DIR .. "src/mame/machine/deco102.cpp", + MAME_DIR .. "src/mame/machine/deco102.h", MAME_DIR .. "src/mame/machine/decocrpt.cpp", - MAME_DIR .. "src/mame/includes/decocrpt.h", + MAME_DIR .. "src/mame/machine/decocrpt.h", MAME_DIR .. "src/mame/machine/deco104.cpp", MAME_DIR .. "src/mame/machine/deco104.h", MAME_DIR .. "src/mame/machine/deco146.cpp", @@ -1622,7 +1631,6 @@ files { MAME_DIR .. "src/mame/includes/eolith.h", MAME_DIR .. "src/mame/video/eolith.cpp", MAME_DIR .. "src/mame/drivers/eolith16.cpp", - MAME_DIR .. "src/mame/drivers/eolithsp.cpp", MAME_DIR .. "src/mame/drivers/ghosteo.cpp", MAME_DIR .. "src/mame/drivers/vegaeo.cpp", } @@ -1658,6 +1666,7 @@ files { MAME_DIR .. "src/mame/audio/exidy.h", MAME_DIR .. "src/mame/video/exidy.cpp", MAME_DIR .. "src/mame/audio/targ.cpp", + MAME_DIR .. "src/mame/audio/targ.h", MAME_DIR .. "src/mame/drivers/exidy440.cpp", MAME_DIR .. "src/mame/includes/exidy440.h", MAME_DIR .. "src/mame/audio/exidy440.cpp", @@ -1832,12 +1841,19 @@ files { MAME_DIR .. "src/mame/includes/pgm.h", MAME_DIR .. "src/mame/video/pgm.cpp", MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.h", MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type2.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type2.h", MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type3.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type3.h", MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs012.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs012.h", MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs022.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs022.h", MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs028.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs028.h", MAME_DIR .. "src/mame/machine/pgmprot_orlegend.cpp", + MAME_DIR .. "src/mame/machine/pgmprot_orlegend.h", MAME_DIR .. "src/mame/drivers/pgm2.cpp", MAME_DIR .. "src/mame/drivers/spoker.cpp", MAME_DIR .. "src/mame/machine/igs036crypt.cpp", @@ -1905,7 +1921,8 @@ files { MAME_DIR .. "src/mame/machine/irem_cpu.h", MAME_DIR .. "src/mame/audio/irem.cpp", MAME_DIR .. "src/mame/audio/irem.h", - MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", + MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", + MAME_DIR .. "src/mame/audio/nl_kidniki.h", } createMAMEProjects(_target, _subtarget, "itech") @@ -1915,7 +1932,7 @@ files { MAME_DIR .. "src/mame/video/capbowl.cpp", MAME_DIR .. "src/mame/drivers/itech8.cpp", MAME_DIR .. "src/mame/includes/itech8.h", - MAME_DIR .. "src/mame/machine/slikshot.cpp", + MAME_DIR .. "src/mame/machine/itech8.cpp", MAME_DIR .. "src/mame/video/itech8.cpp", MAME_DIR .. "src/mame/drivers/itech32.cpp", MAME_DIR .. "src/mame/includes/itech32.h", @@ -2366,7 +2383,7 @@ createMAMEProjects(_target, _subtarget, "maygay") files { MAME_DIR .. "src/mame/drivers/maygay1b.cpp", MAME_DIR .. "src/mame/includes/maygay1b.h", - MAME_DIR .. "src/mame/drivers/maygay1bsw.cpp", + MAME_DIR .. "src/mame/drivers/maygay1b.hxx", MAME_DIR .. "src/mame/drivers/maygayv1.cpp", MAME_DIR .. "src/mame/drivers/maygayep.cpp", MAME_DIR .. "src/mame/drivers/maygaysw.cpp", @@ -2435,7 +2452,9 @@ files { MAME_DIR .. "src/mame/includes/astrocde.h", MAME_DIR .. "src/mame/video/astrocde.cpp", MAME_DIR .. "src/mame/audio/gorf.cpp", + MAME_DIR .. "src/mame/audio/gorf.h", MAME_DIR .. "src/mame/audio/wow.cpp", + MAME_DIR .. "src/mame/audio/wow.h", MAME_DIR .. "src/mame/drivers/atlantis.cpp", MAME_DIR .. "src/mame/drivers/balsente.cpp", MAME_DIR .. "src/mame/includes/balsente.h", @@ -2477,6 +2496,7 @@ files { MAME_DIR .. "src/mame/video/midyunit.cpp", MAME_DIR .. "src/mame/drivers/midzeus.cpp", MAME_DIR .. "src/mame/includes/midzeus.h", + MAME_DIR .. "src/mame/includes/midzeus2.h", MAME_DIR .. "src/mame/video/midzeus.cpp", MAME_DIR .. "src/mame/video/midzeus2.cpp", MAME_DIR .. "src/mame/drivers/mw18w.cpp", @@ -2519,8 +2539,11 @@ files { MAME_DIR .. "src/mame/audio/galaga.cpp", MAME_DIR .. "src/mame/video/galaga.cpp", MAME_DIR .. "src/mame/video/bosco.cpp", + MAME_DIR .. "src/mame/includes/bosco.h", MAME_DIR .. "src/mame/video/digdug.cpp", + MAME_DIR .. "src/mame/includes/digdug.h", MAME_DIR .. "src/mame/machine/xevious.cpp", + MAME_DIR .. "src/mame/includes/xevious.h", MAME_DIR .. "src/mame/video/xevious.cpp", MAME_DIR .. "src/mame/drivers/galaxian.cpp", MAME_DIR .. "src/mame/includes/galaxian.h", @@ -2542,7 +2565,7 @@ files { MAME_DIR .. "src/mame/drivers/namcofl.cpp", MAME_DIR .. "src/mame/includes/namcofl.h", MAME_DIR .. "src/mame/video/namcofl.cpp", - MAME_DIR .. "src/mame/drivers/namcoic.cpp", + MAME_DIR .. "src/mame/machine/namcoic.cpp", MAME_DIR .. "src/mame/includes/namcoic.h", MAME_DIR .. "src/mame/drivers/namcona1.cpp", MAME_DIR .. "src/mame/includes/namcona1.h", @@ -2610,6 +2633,7 @@ files { MAME_DIR .. "src/mame/drivers/warpwarp.cpp", MAME_DIR .. "src/mame/includes/warpwarp.h", MAME_DIR .. "src/mame/audio/geebee.cpp", + MAME_DIR .. "src/mame/audio/geebee.h", MAME_DIR .. "src/mame/audio/warpwarp.cpp", MAME_DIR .. "src/mame/audio/warpwarp.h", MAME_DIR .. "src/mame/video/warpwarp.cpp", @@ -2651,11 +2675,11 @@ createMAMEProjects(_target, _subtarget, "neogeo") files { MAME_DIR .. "src/mame/drivers/neogeo.cpp", MAME_DIR .. "src/mame/includes/neogeo.h", + MAME_DIR .. "src/mame/drivers/neodriv.hxx", MAME_DIR .. "src/mame/video/neogeo.cpp", - MAME_DIR .. "src/mame/drivers/neogeo_noslot.cpp", + MAME_DIR .. "src/mame/drivers/neopcb.cpp", MAME_DIR .. "src/mame/video/neogeo_spr.cpp", MAME_DIR .. "src/mame/video/neogeo_spr.h", - MAME_DIR .. "src/mame/machine/neocrypt.cpp", MAME_DIR .. "src/mame/machine/ng_memcard.cpp", MAME_DIR .. "src/mame/machine/ng_memcard.h", } @@ -2874,9 +2898,13 @@ files { MAME_DIR .. "src/mame/includes/pacman.h", MAME_DIR .. "src/mame/video/pacman.cpp", MAME_DIR .. "src/mame/machine/acitya.cpp", + MAME_DIR .. "src/mame/machine/acitya.h", MAME_DIR .. "src/mame/machine/jumpshot.cpp", + MAME_DIR .. "src/mame/machine/jumpshot.h", MAME_DIR .. "src/mame/machine/pacplus.cpp", + MAME_DIR .. "src/mame/machine/pacplus.h", MAME_DIR .. "src/mame/machine/theglobp.cpp", + MAME_DIR .. "src/mame/machine/theglobp.h", MAME_DIR .. "src/mame/drivers/pengo.cpp", } @@ -3005,6 +3033,7 @@ files { MAME_DIR .. "src/mame/machine/megadriv.cpp", MAME_DIR .. "src/mame/includes/megadriv.h", MAME_DIR .. "src/mame/drivers/megadrvb.cpp", + MAME_DIR .. "src/mame/includes/megadrvb.h", MAME_DIR .. "src/mame/drivers/megaplay.cpp", MAME_DIR .. "src/mame/drivers/megatech.cpp", MAME_DIR .. "src/mame/drivers/model1.cpp", @@ -3019,7 +3048,7 @@ files { MAME_DIR .. "src/mame/audio/dsbz80.h", MAME_DIR .. "src/mame/drivers/model2.cpp", MAME_DIR .. "src/mame/includes/model2.h", - MAME_DIR .. "src/mame/video/model2rd.inc", + MAME_DIR .. "src/mame/video/model2rd.hxx", MAME_DIR .. "src/mame/video/model2.cpp", MAME_DIR .. "src/mame/drivers/model3.cpp", MAME_DIR .. "src/mame/includes/model3.h", @@ -3123,8 +3152,12 @@ files { MAME_DIR .. "src/mame/includes/stactics.h", MAME_DIR .. "src/mame/video/stactics.cpp", MAME_DIR .. "src/mame/drivers/stv.cpp", + MAME_DIR .. "src/mame/includes/saturn.h", + MAME_DIR .. "src/mame/drivers/saturn.cpp", + MAME_DIR .. "src/mame/machine/saturn.cpp", MAME_DIR .. "src/mame/includes/stv.h", MAME_DIR .. "src/mame/machine/stvprot.cpp", + MAME_DIR .. "src/mame/machine/stvprot.h", MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.cpp", MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.h", MAME_DIR .. "src/mame/drivers/suprloco.cpp", @@ -3146,11 +3179,16 @@ files { MAME_DIR .. "src/mame/drivers/vicdual.cpp", MAME_DIR .. "src/mame/includes/vicdual.h", MAME_DIR .. "src/mame/audio/vicdual.cpp", + MAME_DIR .. "src/mame/audio/vicdual.h", MAME_DIR .. "src/mame/video/vicdual.cpp", MAME_DIR .. "src/mame/audio/carnival.cpp", + MAME_DIR .. "src/mame/audio/carnival.h", MAME_DIR .. "src/mame/audio/depthch.cpp", + MAME_DIR .. "src/mame/audio/depthch.h", MAME_DIR .. "src/mame/audio/invinco.cpp", + MAME_DIR .. "src/mame/audio/invinco.h", MAME_DIR .. "src/mame/audio/pulsar.cpp", + MAME_DIR .. "src/mame/audio/pulsar.h", MAME_DIR .. "src/mame/drivers/zaxxon.cpp", MAME_DIR .. "src/mame/includes/zaxxon.h", MAME_DIR .. "src/mame/audio/zaxxon.cpp", @@ -3211,6 +3249,7 @@ files { MAME_DIR .. "src/mame/drivers/legionna.cpp", MAME_DIR .. "src/mame/includes/legionna.h", MAME_DIR .. "src/mame/video/legionna.cpp", + MAME_DIR .. "src/mame/drivers/metlfrzr.cpp", MAME_DIR .. "src/mame/drivers/mustache.cpp", MAME_DIR .. "src/mame/includes/mustache.h", MAME_DIR .. "src/mame/video/mustache.cpp", @@ -3221,6 +3260,7 @@ files { MAME_DIR .. "src/mame/drivers/raiden2.cpp", MAME_DIR .. "src/mame/includes/raiden2.h", MAME_DIR .. "src/mame/machine/r2crypt.cpp", + MAME_DIR .. "src/mame/machine/r2crypt.h", MAME_DIR .. "src/mame/machine/raiden2cop.cpp", MAME_DIR .. "src/mame/machine/raiden2cop.h", MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp", @@ -3243,6 +3283,7 @@ files { MAME_DIR .. "src/mame/machine/seicop.cpp", MAME_DIR .. "src/mame/machine/seicop.h", MAME_DIR .. "src/mame/machine/spisprit.cpp", + MAME_DIR .. "src/mame/machine/spisprit.h", MAME_DIR .. "src/mame/audio/seibu.cpp", MAME_DIR .. "src/mame/audio/seibu.h", MAME_DIR .. "src/mame/video/seibu_crtc.cpp", @@ -3255,7 +3296,7 @@ files { MAME_DIR .. "src/mame/machine/n64.cpp", MAME_DIR .. "src/mame/video/n64.cpp", MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.inc", + MAME_DIR .. "src/mame/video/rdpfiltr.hxx", MAME_DIR .. "src/mame/video/n64.h", MAME_DIR .. "src/mame/video/rdpblend.cpp", MAME_DIR .. "src/mame/video/rdpblend.h", @@ -3318,8 +3359,9 @@ files { MAME_DIR .. "src/mame/video/hng64.cpp", MAME_DIR .. "src/mame/audio/hng64.cpp", MAME_DIR .. "src/mame/machine/hng64_net.cpp", - MAME_DIR .. "src/mame/video/hng64_3d.cpp", - MAME_DIR .. "src/mame/video/hng64_sprite.cpp", + MAME_DIR .. "src/mame/machine/hng64_net.h", + MAME_DIR .. "src/mame/video/hng64_3d.hxx", + MAME_DIR .. "src/mame/video/hng64_sprite.hxx", MAME_DIR .. "src/mame/drivers/lasso.cpp", MAME_DIR .. "src/mame/includes/lasso.h", MAME_DIR .. "src/mame/video/lasso.cpp", @@ -3361,6 +3403,7 @@ files { MAME_DIR .. "src/mame/drivers/berzerk.cpp", MAME_DIR .. "src/mame/drivers/cliffhgr.cpp", MAME_DIR .. "src/mame/audio/cliffhgr.cpp", + MAME_DIR .. "src/mame/audio/cliffhgr.h", MAME_DIR .. "src/mame/drivers/mazerbla.cpp", MAME_DIR .. "src/mame/drivers/supdrapo.cpp", } @@ -3439,6 +3482,7 @@ files { MAME_DIR .. "src/mame/drivers/asuka.cpp", MAME_DIR .. "src/mame/includes/asuka.h", MAME_DIR .. "src/mame/machine/bonzeadv.cpp", + MAME_DIR .. "src/mame/machine/bonzeadv.h", MAME_DIR .. "src/mame/video/asuka.cpp", MAME_DIR .. "src/mame/drivers/bigevglf.cpp", MAME_DIR .. "src/mame/includes/bigevglf.h", @@ -3606,6 +3650,7 @@ files { MAME_DIR .. "src/mame/drivers/taito_x.cpp", MAME_DIR .. "src/mame/includes/taito_x.h", MAME_DIR .. "src/mame/machine/cchip.cpp", + MAME_DIR .. "src/mame/machine/cchip.h", MAME_DIR .. "src/mame/drivers/taito_z.cpp", MAME_DIR .. "src/mame/includes/taito_z.h", MAME_DIR .. "src/mame/video/taito_z.cpp", @@ -3859,9 +3904,9 @@ files { MAME_DIR .. "src/mame/video/slapfght.cpp", MAME_DIR .. "src/mame/drivers/snowbros.cpp", MAME_DIR .. "src/mame/includes/snowbros.h", + MAME_DIR .. "src/mame/video/snowbros.cpp", MAME_DIR .. "src/mame/video/kan_pand.cpp", - MAME_DIR .. "src/mame/video/kan_pand.h", - MAME_DIR .. "src/mame/video/kan_panb.cpp", + MAME_DIR .. "src/mame/video/kan_pand.h", MAME_DIR .. "src/mame/drivers/toaplan1.cpp", MAME_DIR .. "src/mame/includes/toaplan1.h", MAME_DIR .. "src/mame/machine/toaplan1.cpp", @@ -3922,6 +3967,7 @@ files { MAME_DIR .. "src/mame/includes/mrdo.h", MAME_DIR .. "src/mame/video/mrdo.cpp", MAME_DIR .. "src/mame/drivers/redclash.cpp", + MAME_DIR .. "src/mame/includes/redclash.h", MAME_DIR .. "src/mame/video/redclash.cpp", MAME_DIR .. "src/mame/drivers/superdq.cpp", } @@ -4114,8 +4160,11 @@ files { MAME_DIR .. "src/mame/drivers/s11.cpp", MAME_DIR .. "src/mame/includes/s11.h", MAME_DIR .. "src/mame/drivers/s11a.cpp", + MAME_DIR .. "src/mame/includes/s11a.h", MAME_DIR .. "src/mame/drivers/s11b.cpp", + MAME_DIR .. "src/mame/includes/s11b.h", MAME_DIR .. "src/mame/drivers/s11c.cpp", + MAME_DIR .. "src/mame/includes/s11c.h", MAME_DIR .. "src/mame/audio/s11c_bg.cpp", MAME_DIR .. "src/mame/audio/s11c_bg.h", MAME_DIR .. "src/mame/drivers/s3.cpp", @@ -4142,12 +4191,14 @@ files { MAME_DIR .. "src/mame/drivers/wpc_an.cpp", MAME_DIR .. "src/mame/drivers/wpc_dcs.cpp", MAME_DIR .. "src/mame/drivers/wpc_dot.cpp", + MAME_DIR .. "src/mame/includes/wpc_dot.h", MAME_DIR .. "src/mame/drivers/wpc_flip1.cpp", + MAME_DIR .. "src/mame/includes/wpc_flip1.h", MAME_DIR .. "src/mame/drivers/wpc_flip2.cpp", + MAME_DIR .. "src/mame/includes/wpc_flip2.h", MAME_DIR .. "src/mame/drivers/wpc_s.cpp", MAME_DIR .. "src/mame/machine/wpc.cpp", MAME_DIR .. "src/mame/machine/wpc.h", - MAME_DIR .. "src/mame/includes/wpc_pin.h", MAME_DIR .. "src/mame/audio/wpcsnd.cpp", MAME_DIR .. "src/mame/audio/wpcsnd.h", MAME_DIR .. "src/mame/video/wpc_dmd.cpp", @@ -4422,7 +4473,6 @@ files { MAME_DIR .. "src/mame/drivers/multfish.cpp", MAME_DIR .. "src/mame/includes/multfish.h", MAME_DIR .. "src/mame/drivers/multfish_boot.cpp", - MAME_DIR .. "src/mame/drivers/multfish_ref.cpp", MAME_DIR .. "src/mame/drivers/murogem.cpp", MAME_DIR .. "src/mame/drivers/murogmbl.cpp", MAME_DIR .. "src/mame/drivers/neoprint.cpp", @@ -4536,7 +4586,6 @@ files { MAME_DIR .. "src/mame/drivers/ice_bozopail.cpp", MAME_DIR .. "src/mame/drivers/ice_tbd.cpp", MAME_DIR .. "src/mame/drivers/umipoker.cpp", - MAME_DIR .. "src/mame/drivers/unkfr.cpp", MAME_DIR .. "src/mame/drivers/unkhorse.cpp", MAME_DIR .. "src/mame/drivers/usgames.cpp", MAME_DIR .. "src/mame/includes/usgames.h", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index a4ebde0ff24..13898021fd6 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -58,6 +58,7 @@ CPUS["JAGUAR"] = true CPUS["CUBEQCPU"] = true CPUS["ESRIP"] = true CPUS["MIPS"] = true +CPUS["R3000"] = true CPUS["PSX"] = true CPUS["SH2"] = true CPUS["SH4"] = true @@ -256,7 +257,8 @@ SOUNDS["T6721A"] = true SOUNDS["MOS7360"] = true SOUNDS["ESQPUMP"] = true SOUNDS["VRC6"] = true - +SOUNDS["UPD1771"] = true +SOUNDS["GB_SOUND"] = true -------------------------------------------------- -- specify available video cores -------------------------------------------------- @@ -279,7 +281,6 @@ VIDEOS["EF9365"] = true VIDEOS["GF4500"] = true --VIDEOS+= EPIC12"] = true --VIDEOS+= FIXFREQ"] = true ---VIDEOS+= H63484"] = true VIDEOS["HD44102"] = true VIDEOS["HD44352"] = true VIDEOS["HD44780"] = true @@ -328,6 +329,7 @@ VIDEOS["V9938"] = true VIDEOS["VIC4567"] = true --VIDEOS+= VOODOO"] = true VIDEOS["SCN2674"] = true +VIDEOS["GB_LCD"] = true -------------------------------------------------- -- specify available machine cores @@ -542,6 +544,7 @@ MACHINES["UPD4701"] = true MACHINES["UPD7002"] = true MACHINES["UPD71071"] = true MACHINES["UPD765"] = true +MACHINES["FDC_PLL"] = true MACHINES["V3021"] = true MACHINES["WD_FDC"] = true MACHINES["WD11C00_17"] = true @@ -575,6 +578,11 @@ MACHINES["NSC810"] = true MACHINES["VT82C496"] = true MACHINES["GENPC"] = true MACHINES["GEN_LATCH"] = true +MACHINES["WATCHDOG"] = true +MACHINES["SMARTMEDIA"] = true +MACHINES["APPLE_DRIVE"] = true +MACHINES["APPLE_FDC"] = true +MACHINES["SONY_DRIVE"] = true -------------------------------------------------- -- specify available bus cores @@ -936,7 +944,7 @@ function createProjects_mame_mess(_target, _subtarget) -- n64.c (MESS), aleck64.c (MAME) -- megadriv.c, segapico.c (MESS), hshavoc.c, megadrvb.c, megaplay.c, megatech.c, puckpkmn.c, segac2.c, segas18.c (MAME) -- dccons.c (MESS), naomi.c (MAME) --- ng_aes.c (MESS), midas.c, neogeo.c, neogeo_noslot.c, neoprint.c (MAME) +-- neogeocd.c (MESS), midas.c, neogeo.c, neoprint.c (MAME) -- cdi.c (MESS + MAME) -- 3do.c (MESS + MAME), konamim2.c (MAME) -- vectrex.c (MESS + MAME) @@ -950,6 +958,7 @@ files { MAME_DIR .. "src/mame/machine/amiga.cpp", MAME_DIR .. "src/mame/video/amiga.cpp", MAME_DIR .. "src/mame/video/amigaaga.cpp", + MAME_DIR .. "src/mame/video/amigaaga.h", MAME_DIR .. "src/mame/video/tia.cpp", MAME_DIR .. "src/mame/video/tia.h", MAME_DIR .. "src/mame/machine/atari400.cpp", @@ -964,8 +973,8 @@ files { MAME_DIR .. "src/mame/audio/jaguar.cpp", MAME_DIR .. "src/mame/video/jaguar.cpp", MAME_DIR .. "src/mame/video/jagblit.h", - MAME_DIR .. "src/mame/video/jagblit.inc", - MAME_DIR .. "src/mame/video/jagobj.inc", + MAME_DIR .. "src/mame/video/jagblit.hxx", + MAME_DIR .. "src/mame/video/jagobj.hxx", MAME_DIR .. "src/mame/audio/gorf.cpp", MAME_DIR .. "src/mame/audio/wow.cpp", MAME_DIR .. "src/mame/drivers/astrocde.cpp", @@ -982,7 +991,7 @@ files { MAME_DIR .. "src/mame/machine/n64.cpp", MAME_DIR .. "src/mame/video/n64.cpp", MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.inc", + MAME_DIR .. "src/mame/video/rdpfiltr.hxx", MAME_DIR .. "src/mame/video/n64.h", MAME_DIR .. "src/mame/video/rdpblend.cpp", MAME_DIR .. "src/mame/video/rdpblend.h", @@ -1028,7 +1037,6 @@ files { MAME_DIR .. "src/mame/video/powervr2.h", MAME_DIR .. "src/mame/drivers/neogeo.cpp", MAME_DIR .. "src/mame/includes/neogeo.h", - MAME_DIR .. "src/mame/machine/neocrypt.cpp", MAME_DIR .. "src/mame/machine/ng_memcard.cpp", MAME_DIR .. "src/mame/machine/ng_memcard.h", MAME_DIR .. "src/mame/video/neogeo.cpp", @@ -1057,6 +1065,9 @@ files { MAME_DIR .. "src/mame/video/cps1.cpp", MAME_DIR .. "src/mame/video/chihiro.cpp", MAME_DIR .. "src/mame/machine/xbox.cpp", + MAME_DIR .. "src/mame/includes/saturn.h", + MAME_DIR .. "src/mame/drivers/saturn.cpp", + MAME_DIR .. "src/mame/machine/saturn.cpp", } end -------------------------------------------------- @@ -1067,16 +1078,8 @@ createMESSProjects(_target, _subtarget, "messshared") files { MAME_DIR .. "src/mame/audio/mea8000.cpp", MAME_DIR .. "src/mame/audio/mea8000.h", - MAME_DIR .. "src/mame/machine/appldriv.cpp", - MAME_DIR .. "src/mame/machine/appldriv.h", - MAME_DIR .. "src/mame/machine/applefdc.cpp", - MAME_DIR .. "src/mame/machine/applefdc.h", MAME_DIR .. "src/mame/machine/microdrv.cpp", MAME_DIR .. "src/mame/machine/microdrv.h", - MAME_DIR .. "src/mame/machine/smartmed.cpp", - MAME_DIR .. "src/mame/machine/smartmed.h", - MAME_DIR .. "src/mame/machine/sonydriv.cpp", - MAME_DIR .. "src/mame/machine/sonydriv.h", MAME_DIR .. "src/mame/machine/teleprinter.cpp", MAME_DIR .. "src/mame/machine/teleprinter.h", MAME_DIR .. "src/mame/machine/z80bin.cpp", @@ -1146,6 +1149,7 @@ files { createMESSProjects(_target, _subtarget, "altos") files { MAME_DIR .. "src/mame/drivers/altos5.cpp", + MAME_DIR .. "src/mame/drivers/altos486.cpp", } createMESSProjects(_target, _subtarget, "amiga") @@ -1202,6 +1206,7 @@ files { MAME_DIR .. "src/mame/drivers/apple2.cpp", MAME_DIR .. "src/mame/includes/apple2.h", MAME_DIR .. "src/mame/drivers/apple2e.cpp", + MAME_DIR .. "src/mame/includes/apple2e.h", MAME_DIR .. "src/mame/machine/apple2.cpp", MAME_DIR .. "src/mame/video/apple2.cpp", MAME_DIR .. "src/mame/video/apple2.h", @@ -1224,6 +1229,7 @@ files { MAME_DIR .. "src/mame/machine/egret.h", MAME_DIR .. "src/mame/machine/mac.cpp", MAME_DIR .. "src/mame/machine/macadb.cpp", + MAME_DIR .. "src/mame/machine/macadb.h", MAME_DIR .. "src/mame/machine/macrtc.cpp", MAME_DIR .. "src/mame/machine/macrtc.h", MAME_DIR .. "src/mame/machine/mackbd.cpp", @@ -1677,8 +1683,6 @@ files { MAME_DIR .. "src/mame/includes/gamepock.h", MAME_DIR .. "src/mame/machine/gamepock.cpp", MAME_DIR .. "src/mame/drivers/scv.cpp", - MAME_DIR .. "src/devices/sound/upd1771.cpp", - MAME_DIR .. "src/devices/sound/upd1771.h", } createMESSProjects(_target, _subtarget, "epson") @@ -1839,8 +1843,7 @@ files { MAME_DIR .. "src/mame/drivers/hec2hrp.cpp", MAME_DIR .. "src/mame/includes/hec2hrp.h", MAME_DIR .. "src/mame/machine/hec2hrp.cpp", - MAME_DIR .. "src/mame/machine/hecdisk2.cpp", - MAME_DIR .. "src/mame/video/hec2video.cpp", + MAME_DIR .. "src/mame/video/hec2hrp.cpp", MAME_DIR .. "src/mame/drivers/interact.cpp", } @@ -1902,6 +1905,7 @@ files { MAME_DIR .. "src/mame/includes/kaypro.h", MAME_DIR .. "src/mame/machine/kaypro.cpp", MAME_DIR .. "src/mame/machine/kay_kbd.cpp", + MAME_DIR .. "src/mame/machine/kay_kbd.h", MAME_DIR .. "src/mame/video/kaypro.cpp", } @@ -1927,8 +1931,11 @@ files { MAME_DIR .. "src/mame/drivers/abc80x.cpp", MAME_DIR .. "src/mame/includes/abc80x.h", MAME_DIR .. "src/mame/video/abc800.cpp", + MAME_DIR .. "src/mame/video/abc800.h", MAME_DIR .. "src/mame/video/abc802.cpp", + MAME_DIR .. "src/mame/video/abc802.h", MAME_DIR .. "src/mame/video/abc806.cpp", + MAME_DIR .. "src/mame/video/abc806.h", MAME_DIR .. "src/mame/drivers/abc1600.cpp", MAME_DIR .. "src/mame/includes/abc1600.h", MAME_DIR .. "src/mame/machine/abc1600mac.cpp", @@ -2050,6 +2057,7 @@ createMESSProjects(_target, _subtarget, "motorola") files { MAME_DIR .. "src/mame/drivers/m6805evs.cpp", MAME_DIR .. "src/mame/drivers/mekd2.cpp", + MAME_DIR .. "src/mame/drivers/mvme147.cpp", } createMESSProjects(_target, _subtarget, "multitch") @@ -2134,11 +2142,7 @@ createMESSProjects(_target, _subtarget, "nintendo") files { MAME_DIR .. "src/mame/drivers/gb.cpp", MAME_DIR .. "src/mame/includes/gb.h", - MAME_DIR .. "src/mame/audio/gb.cpp", - MAME_DIR .. "src/mame/audio/gb.h", MAME_DIR .. "src/mame/machine/gb.cpp", - MAME_DIR .. "src/mame/video/gb_lcd.cpp", - MAME_DIR .. "src/mame/video/gb_lcd.h", MAME_DIR .. "src/mame/drivers/gba.cpp", MAME_DIR .. "src/mame/includes/gba.h", MAME_DIR .. "src/mame/video/gba.cpp", @@ -2153,10 +2157,10 @@ files { MAME_DIR .. "src/mame/includes/snes.h", MAME_DIR .. "src/mame/machine/snescx4.cpp", MAME_DIR .. "src/mame/machine/snescx4.h", - MAME_DIR .. "src/mame/machine/cx4data.inc", - MAME_DIR .. "src/mame/machine/cx4fn.inc", - MAME_DIR .. "src/mame/machine/cx4oam.inc", - MAME_DIR .. "src/mame/machine/cx4ops.inc", + MAME_DIR .. "src/mame/machine/cx4data.hxx", + MAME_DIR .. "src/mame/machine/cx4fn.hxx", + MAME_DIR .. "src/mame/machine/cx4oam.hxx", + MAME_DIR .. "src/mame/machine/cx4ops.hxx", MAME_DIR .. "src/mame/drivers/vboy.cpp", MAME_DIR .. "src/mame/audio/vboy.cpp", MAME_DIR .. "src/mame/audio/vboy.h", @@ -2247,7 +2251,7 @@ files { createMESSProjects(_target, _subtarget, "palm") files { MAME_DIR .. "src/mame/drivers/palm.cpp", - MAME_DIR .. "src/mame/drivers/palm_dbg.inc", + MAME_DIR .. "src/mame/drivers/palm_dbg.hxx", MAME_DIR .. "src/mame/drivers/palmz22.cpp", } @@ -2297,7 +2301,7 @@ files { MAME_DIR .. "src/mame/drivers/p2000t.cpp", MAME_DIR .. "src/mame/includes/p2000t.h", MAME_DIR .. "src/mame/machine/p2000t.cpp", - MAME_DIR .. "src/mame/video/p2000m.cpp", + MAME_DIR .. "src/mame/video/p2000t.cpp", MAME_DIR .. "src/mame/drivers/vg5k.cpp", } @@ -2438,7 +2442,6 @@ files { MAME_DIR .. "src/mame/machine/dccons.cpp", MAME_DIR .. "src/mame/drivers/megadriv.cpp", MAME_DIR .. "src/mame/includes/megadriv.h", - MAME_DIR .. "src/mame/drivers/saturn.cpp", MAME_DIR .. "src/mame/drivers/segapico.cpp", MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp", MAME_DIR .. "src/mame/drivers/segapm.cpp", @@ -2533,8 +2536,11 @@ files { MAME_DIR .. "src/mame/drivers/spectrum.cpp", MAME_DIR .. "src/mame/includes/spectrum.h", MAME_DIR .. "src/mame/drivers/spec128.cpp", + MAME_DIR .. "src/mame/includes/spec128.h", MAME_DIR .. "src/mame/drivers/timex.cpp", + MAME_DIR .. "src/mame/includes/timex.h", MAME_DIR .. "src/mame/drivers/specpls3.cpp", + MAME_DIR .. "src/mame/includes/specpls3.h", MAME_DIR .. "src/mame/drivers/scorpion.cpp", MAME_DIR .. "src/mame/drivers/atm.cpp", MAME_DIR .. "src/mame/drivers/pentagon.cpp", @@ -2568,7 +2574,7 @@ files { createMESSProjects(_target, _subtarget, "snk") files { - MAME_DIR .. "src/mame/drivers/ng_aes.cpp", + MAME_DIR .. "src/mame/drivers/neogeocd.cpp", MAME_DIR .. "src/mame/drivers/ngp.cpp", MAME_DIR .. "src/mame/video/k1ge.cpp", MAME_DIR .. "src/mame/video/k1ge.h", @@ -3007,12 +3013,6 @@ files { MAME_DIR .. "src/mame/drivers/ymmu100.cpp", MAME_DIR .. "src/mame/drivers/fb01.cpp", } -dependency { - { MAME_DIR .. "src/mame/drivers/ymmu100.cpp", GEN_DIR .. "mame/drivers/ymmu100.inc" }, -} -custombuildtask { - { MAME_DIR .. "src/mame/drivers/ymmu100.ppm", GEN_DIR .. "mame/drivers/ymmu100.inc", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", PYTHON .. " $(1) $(<) $(@) ymmu100_bkg UINT8" }}, -} createMESSProjects(_target, _subtarget, "zenith") files { @@ -3086,6 +3086,7 @@ files { MAME_DIR .. "src/mame/drivers/fanucs15.cpp", MAME_DIR .. "src/mame/drivers/fanucspmg.cpp", MAME_DIR .. "src/mame/drivers/fc100.cpp", + MAME_DIR .. "src/mame/drivers/fcscsi.cpp", MAME_DIR .. "src/mame/drivers/fk1.cpp", MAME_DIR .. "src/mame/drivers/ft68m.cpp", MAME_DIR .. "src/mame/drivers/gamate.cpp", @@ -3101,6 +3102,7 @@ files { MAME_DIR .. "src/mame/drivers/ht68k.cpp", MAME_DIR .. "src/mame/drivers/hunter2.cpp", MAME_DIR .. "src/mame/drivers/i7000.cpp", + MAME_DIR .. "src/mame/drivers/ibm3153.cpp", MAME_DIR .. "src/mame/drivers/ibm6580.cpp", MAME_DIR .. "src/mame/drivers/icatel.cpp", MAME_DIR .. "src/mame/drivers/ie15.cpp", @@ -3191,6 +3193,7 @@ files { MAME_DIR .. "src/mame/includes/xor100.h", MAME_DIR .. "src/mame/drivers/xavix.cpp", MAME_DIR .. "src/mame/drivers/zorba.cpp", + MAME_DIR .. "src/mame/drivers/mvme350.cpp", } end diff --git a/docs/release/scripts/target/mame/nl.lua b/docs/release/scripts/target/mame/nl.lua index 6abf50dcd1e..08829959c1f 100644 --- a/docs/release/scripts/target/mame/nl.lua +++ b/docs/release/scripts/target/mame/nl.lua @@ -20,7 +20,7 @@ CPUS["Z80"] = true CPUS["M6800"] = true CPUS["M6803"] = true CPUS["M6809"] = true ---CPUS["MCS48"] = true +CPUS["MCS48"] = true --CPUS["MCS51"] = true --CPUS["M6800"] = true --CPUS["M6809"] = true @@ -57,6 +57,8 @@ VIDEOS["FIXFREQ"] = true -------------------------------------------------- MACHINES["NETLIST"] = true +MACHINES["Z80DMA"] = true +MACHINES["GEN_LATCH"] = true --MACHINES["6821PIA"] = true --MACHINES["TTL74148"] = true --MACHINES["TTL74153"] = true @@ -86,8 +88,8 @@ function createProjects_mame_nl(_target, _subtarget) targetsubdir(_target .."_" .. _subtarget) kind (LIBTYPE) uuid (os.uuid("drv-mame-nl")) - addprojectflags() - precompiledheaders() + addprojectflags() + precompiledheaders() includedirs { MAME_DIR .. "src/osd", @@ -103,24 +105,33 @@ function createProjects_mame_nl(_target, _subtarget) files{ MAME_DIR .. "src/mame/drivers/pong.cpp", - MAME_DIR .. "src/mame/drivers/nl_pong.cpp", - MAME_DIR .. "src/mame/drivers/nl_pongd.cpp", - MAME_DIR .. "src/mame/drivers/nl_breakout.cpp", + MAME_DIR .. "src/mame/machine/nl_pong.cpp", + MAME_DIR .. "src/mame/machine/nl_pong.h", + MAME_DIR .. "src/mame/machine/nl_pongd.cpp", + MAME_DIR .. "src/mame/machine/nl_pongd.h", + MAME_DIR .. "src/mame/machine/nl_breakout.cpp", + MAME_DIR .. "src/mame/machine/nl_breakout.h", MAME_DIR .. "src/mame/drivers/1942.cpp", MAME_DIR .. "src/mame/includes/1942.h", MAME_DIR .. "src/mame/video/1942.cpp", + MAME_DIR .. "src/mame/drivers/popeye.cpp", MAME_DIR .. "src/mame/includes/popeye.h", MAME_DIR .. "src/mame/video/popeye.cpp", - - MAME_DIR .. "src/mame/drivers/m62.cpp", - MAME_DIR .. "src/mame/includes/m62.h", - MAME_DIR .. "src/mame/video/m62.cpp", - MAME_DIR .. "src/mame/audio/irem.cpp", - MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", - MAME_DIR .. "src/mame/audio/irem.h", + MAME_DIR .. "src/mame/drivers/mario.cpp", + MAME_DIR .. "src/mame/includes/mario.h", + MAME_DIR .. "src/mame/video/mario.cpp", + MAME_DIR .. "src/mame/audio/mario.cpp", + + MAME_DIR .. "src/mame/drivers/m62.cpp", + MAME_DIR .. "src/mame/includes/m62.h", + MAME_DIR .. "src/mame/video/m62.cpp", + MAME_DIR .. "src/mame/audio/irem.cpp", + MAME_DIR .. "src/mame/audio/irem.h", + MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", + MAME_DIR .. "src/mame/audio/nl_kidniki.h", } end diff --git a/docs/release/scripts/target/mame/tiny.lua b/docs/release/scripts/target/mame/tiny.lua index 36b4032a525..4e3d4167587 100644 --- a/docs/release/scripts/target/mame/tiny.lua +++ b/docs/release/scripts/target/mame/tiny.lua @@ -61,6 +61,7 @@ MACHINES["PIT8253"] = true MACHINES["Z80CTC"] = true MACHINES["68681"] = true MACHINES["BANKDEV"] = true +MACHINES["WATCHDOG"] = true -------------------------------------------------- diff --git a/docs/release/scripts/target/zexall/zexall.lua b/docs/release/scripts/target/zexall/zexall.lua new file mode 100644 index 00000000000..739cd2a225a --- /dev/null +++ b/docs/release/scripts/target/zexall/zexall.lua @@ -0,0 +1,12 @@ +STANDALONE = true + +CPUS["Z80"] = true + +function standalone() + files{ + MAME_DIR .. "src/zexall/main.cpp", + MAME_DIR .. "src/zexall/zexall.cpp", + MAME_DIR .. "src/zexall/zexall.h", + } +end + diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua index 2a5490fab06..e717102f44e 100644 --- a/docs/release/scripts/toolchain.lua +++ b/docs/release/scripts/toolchain.lua @@ -31,6 +31,7 @@ newoption { { "mingw64-gcc", "MinGW64" }, { "mingw-clang", "MinGW (clang compiler)" }, { "netbsd", "NetBSD" }, + { "openbsd", "OpenBSD" }, { "osx", "OSX (GCC compiler)" }, { "osx-clang", "OSX (Clang compiler)" }, { "pnacl", "Native Client - PNaCl" }, @@ -211,6 +212,10 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd") end + if "openbsd" == _OPTIONS["gcc"] then + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-openbsd") + end + if "ios-arm" == _OPTIONS["gcc"] then premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" @@ -785,6 +790,28 @@ function toolchain(_buildDir, _subDir) configuration { "netbsd", "x64", "Debug" } targetdir (_buildDir .. "netbsd" .. "/bin/x64/Debug") + configuration { "openbsd", "x32" } + objdir (_buildDir .. "openbsd" .. "/obj") + buildoptions { + "-m32", + } + configuration { "openbsd", "x32", "Release" } + targetdir (_buildDir .. "openbsd" .. "/bin/x32/Release") + + configuration { "openbsd", "x32", "Debug" } + targetdir (_buildDir .. "openbsd" .. "/bin/x32/Debug") + + configuration { "openbsd", "x64" } + objdir (_buildDir .. "openbsd" .. "/obj") + buildoptions { + "-m64", + } + configuration { "openbsd", "x64", "Release" } + targetdir (_buildDir .. "openbsd" .. "/bin/x64/Release") + + configuration { "openbsd", "x64", "Debug" } + targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug") + configuration { "android-*" } includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", |