diff options
Diffstat (limited to 'docs/release/scripts')
-rw-r--r-- | docs/release/scripts/build/makedep.py | 5 | ||||
-rw-r--r-- | docs/release/scripts/extlib.lua | 18 | ||||
-rw-r--r-- | docs/release/scripts/genie.lua | 5 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 53 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 19 | ||||
-rw-r--r-- | docs/release/scripts/src/devices.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/src/emu.lua | 5 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 36 | ||||
-rw-r--r-- | docs/release/scripts/src/mame/frontend.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/target/hbmame/hbmame.lua | 48 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/arcade.lua | 24 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/mess.lua | 32 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/nl.lua | 1 | ||||
-rw-r--r-- | docs/release/scripts/target/mame/virtual.lua | 5 |
15 files changed, 241 insertions, 22 deletions
diff --git a/docs/release/scripts/build/makedep.py b/docs/release/scripts/build/makedep.py index cf4a97f1af0..9d8d4666910 100644 --- a/docs/release/scripts/build/makedep.py +++ b/docs/release/scripts/build/makedep.py @@ -240,8 +240,11 @@ if sys.argv[3]=='target': sys.stdout.write(' MAME_DIR .. "src/lib/netlist",\n') sys.stdout.write(' MAME_DIR .. "3rdparty",\n') sys.stdout.write(' GEN_DIR .. "mame/layout",\n') - sys.stdout.write(' ext_includedir("zlib"),\n') sys.stdout.write(' ext_includedir("flac"),\n') + sys.stdout.write(' ext_includedir("glm"),\n') + sys.stdout.write(' ext_includedir("jpeg"),\n') + sys.stdout.write(' ext_includedir("rapidjson"),\n') + sys.stdout.write(' ext_includedir("zlib"),\n') sys.stdout.write(' }\n') sys.stdout.write('\n') sys.stdout.write(' files{\n') diff --git a/docs/release/scripts/extlib.lua b/docs/release/scripts/extlib.lua index 674f1b1d881..e3f7168fe38 100644 --- a/docs/release/scripts/extlib.lua +++ b/docs/release/scripts/extlib.lua @@ -6,6 +6,7 @@ local extlibs = { -- 3rdparty system 3rdparty -- lib name: lib name, include dir -- + asio = { "asio", "3rdparty/asio/include" }, expat = { "expat", "3rdparty/expat/lib" }, zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, @@ -15,10 +16,17 @@ local extlibs = { portaudio = { "portaudio", "3rdparty/portaudio/include" }, lua = { "lua", "3rdparty/lua/src" }, utf8proc = { "utf8proc", "3rdparty/utf8proc" }, + glm = { "glm", "3rdparty/glm" }, + rapidjson = { "rapidjson", "3rdparty/rapidjson/include" }, } -- system lib options newoption { + trigger = 'with-system-asio', + description = 'Use system Asio library', +} + +newoption { trigger = 'with-system-expat', description = 'Use system Expat library', } @@ -63,6 +71,16 @@ newoption { description = "Use system utf8proc library", } +newoption { + trigger = "with-system-glm", + description = "Use system glm library", +} + +newoption { + trigger = "with-system-rapidjson", + description = "Use system rapidjson library", +} + -- build helpers function ext_lib(lib) local opt = _OPTIONS["with-system-" .. lib] diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index d44cdf12a71..6d89686fce8 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -955,7 +955,7 @@ end buildoptions_cpp { "-Woverloaded-virtual", } - + if _OPTIONS["SANITIZE"] then buildoptions { "-fsanitize=".. _OPTIONS["SANITIZE"] @@ -1074,6 +1074,9 @@ configuration { "asmjs" } "-x c++", "-std=c++14", } + linkoptions { + "-Wl,--start-group", + } archivesplit_size "20" configuration { "android*" } diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index ae488168330..4e972faaad5 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -66,6 +66,8 @@ if (BUSES["ABCBUS"]~=null) then MAME_DIR .. "src/devices/bus/abcbus/abcbus.h", MAME_DIR .. "src/devices/bus/abcbus/abc890.cpp", MAME_DIR .. "src/devices/bus/abcbus/abc890.h", + MAME_DIR .. "src/devices/bus/abcbus/cadmouse.cpp", + MAME_DIR .. "src/devices/bus/abcbus/cadmouse.h", MAME_DIR .. "src/devices/bus/abcbus/db411223.cpp", MAME_DIR .. "src/devices/bus/abcbus/db411223.h", MAME_DIR .. "src/devices/bus/abcbus/fd2.cpp", @@ -740,6 +742,41 @@ end --------------------------------------------------- -- +--@src/devices/bus/electron/cart/slot.h,BUSES["ELECTRON_CART"] = true +--------------------------------------------------- + +if (BUSES["ELECTRON_CART"]~=null) then + files { + MAME_DIR .. "src/devices/bus/electron/cart/slot.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/slot.h", + MAME_DIR .. "src/devices/bus/electron/cart/abr.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/abr.h", + MAME_DIR .. "src/devices/bus/electron/cart/ap34.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/ap34.h", + MAME_DIR .. "src/devices/bus/electron/cart/aqr.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/aqr.h", + MAME_DIR .. "src/devices/bus/electron/cart/click.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/click.h", + MAME_DIR .. "src/devices/bus/electron/cart/cumana.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/cumana.h", + MAME_DIR .. "src/devices/bus/electron/cart/peg400.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/peg400.h", + MAME_DIR .. "src/devices/bus/electron/cart/sndexp.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/sndexp.h", + MAME_DIR .. "src/devices/bus/electron/cart/sndexp3.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/sndexp3.h", + MAME_DIR .. "src/devices/bus/electron/cart/sp64.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/sp64.h", + MAME_DIR .. "src/devices/bus/electron/cart/std.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/std.h", + MAME_DIR .. "src/devices/bus/electron/cart/stlefs.cpp", + MAME_DIR .. "src/devices/bus/electron/cart/stlefs.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/ep64/exp.h,BUSES["EP64"] = true --------------------------------------------------- @@ -1795,6 +1832,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.h", MAME_DIR .. "src/devices/bus/a2bus/agat7langcard.cpp", MAME_DIR .. "src/devices/bus/a2bus/agat7langcard.h", + MAME_DIR .. "src/devices/bus/a2bus/agat7ports.cpp", + MAME_DIR .. "src/devices/bus/a2bus/agat7ports.h", MAME_DIR .. "src/devices/bus/a2bus/agat7ram.cpp", MAME_DIR .. "src/devices/bus/a2bus/agat7ram.h", MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.cpp", @@ -3073,6 +3112,20 @@ end --------------------------------------------------- -- +--@src/devices/bus/psx/parallel.h,BUSES["PSX_PARALLEL"] = true +--------------------------------------------------- + +if (BUSES["PSX_PARALLEL"]~=null) then + files { + MAME_DIR .. "src/devices/bus/psx/parallel.cpp", + MAME_DIR .. "src/devices/bus/psx/parallel.h", + MAME_DIR .. "src/devices/bus/psx/gamebooster.cpp", + MAME_DIR .. "src/devices/bus/psx/gamebooster.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/nasbus/nasbus.h,BUSES["NASBUS"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 1c3e33faa21..53f973f56b3 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -1331,6 +1331,7 @@ end --@src/devices/cpu/m6502/m740.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/m3745x.h,CPUS["M6502"] = true --@src/devices/cpu/m6502/m5074x.h,CPUS["M6502"] = true +--@src/devices/cpu/m6502/xavix.h,CPUS["XAVIX"] = true -------------------------------------------------- @@ -1372,6 +1373,8 @@ if (CPUS["M6502"]~=null) then MAME_DIR .. "src/devices/cpu/m6502/m3745x.h", MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp", MAME_DIR .. "src/devices/cpu/m6502/m5074x.h", + MAME_DIR .. "src/devices/cpu/m6502/xavix.cpp", + MAME_DIR .. "src/devices/cpu/m6502/xavix.h", } custombuildtask { @@ -1385,6 +1388,7 @@ if (CPUS["M6502"]~=null) then { 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 disassembler source file...", PYTHON .. " $(1) s n2a03 $(<) $(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 disassembler source file...", PYTHON .. " $(1) s m740 $(<) $(2) $(@)" }}, { 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 disassembler source file...", PYTHON .. " $(1) s r65c02 - $(<) $(@)" }}, + { MAME_DIR .. "src/devices/cpu/m6502/oxavix.lst", GEN_DIR .. "emu/cpu/m6502/xavix.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dxavix.lst" }, {"@echo Generating xavix disassembler source file...", PYTHON .. " $(1) s xavix $(<) $(2) $(@)" }}, } dependency { @@ -1398,6 +1402,7 @@ if (CPUS["M6502"]~=null) then { 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" }, + { MAME_DIR .. "src/devices/cpu/m6502/xavix.cpp", GEN_DIR .. "emu/cpu/m6502/xavix.hxx" }, } end @@ -1412,6 +1417,7 @@ if (CPUS["M6502"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 disassembler source file...", PYTHON .. " $(1) d n2a03 $(<) $(2) $(@)" }}) table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm740.lst" }, {"@echo Generating m740 disassembler source file...", PYTHON .. " $(1) d m740 $(<) $(2) $(@)" }}) table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02d.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", }, {"@echo Generating r65c02 disassembler source file...", PYTHON .. " $(1) d r65c02 - $(<) $(@)" }}) + table.insert(disasm_custombuildtask, { MAME_DIR .. "src/devices/cpu/m6502/oxavix.lst", GEN_DIR .. "emu/cpu/m6502/xavixd.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dxavix.lst" }, {"@echo Generating xavix disassembler source file...", PYTHON .. " $(1) d xavix $(<) $(2) $(@)" }}) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/deco16d.cpp", GEN_DIR .. "emu/cpu/m6502/deco16d.hxx" }) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m4510d.cpp", GEN_DIR .. "emu/cpu/m6502/m4510d.hxx" }) @@ -1423,6 +1429,7 @@ if (CPUS["M6502"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/n2a03d.cpp", GEN_DIR .. "emu/cpu/m6502/n2a03d.hxx" }) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/r65c02d.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02d.hxx" }) table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/m740d.cpp", GEN_DIR .. "emu/cpu/m6502/m740d.hxx" }) + table.insert(disasm_dependency, { MAME_DIR .. "src/devices/cpu/m6502/xavixd.cpp", GEN_DIR .. "emu/cpu/m6502/xavixd.hxx" }) table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/deco16d.cpp") table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/deco16d.h") @@ -1444,6 +1451,8 @@ if (CPUS["M6502"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/n2a03d.h") table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/r65c02d.cpp") table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/r65c02d.h") + table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/xavixd.cpp") + table.insert(disasm_files, MAME_DIR .. "src/devices/cpu/m6502/xavixd.h") end -------------------------------------------------- @@ -2655,3 +2664,13 @@ if (CPUS["CLIPPER"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/clipper/clipperd.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/clipper/clipperd.h") end + + +-------------------------------------------------- +-- VM Labs Nuon, disassembler only +-------------------------------------------------- + +if (_OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nuon/nuondasm.h") +end diff --git a/docs/release/scripts/src/devices.lua b/docs/release/scripts/src/devices.lua index 89d88fd7274..79bcdec11d4 100644 --- a/docs/release/scripts/src/devices.lua +++ b/docs/release/scripts/src/devices.lua @@ -39,9 +39,9 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", + ext_includedir("asio"), ext_includedir("expat"), ext_includedir("flac"), - MAME_DIR .. "3rdparty/asio/include", } dofile(path.join("src", "cpu.lua")) @@ -69,8 +69,8 @@ if #disasm_files > 0 then MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/asio/include", GEN_DIR .. "emu", + ext_includedir("asio"), ext_includedir("expat"), } diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index c4f9f0e6d7e..3a135d39c44 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -29,11 +29,12 @@ includedirs { } includedirs { + ext_includedir("asio"), ext_includedir("expat"), ext_includedir("zlib"), ext_includedir("flac"), ext_includedir("jpeg"), - MAME_DIR .. "3rdparty/asio/include", + ext_includedir("rapidjson"), } files { @@ -184,6 +185,8 @@ files { MAME_DIR .. "src/emu/validity.h", MAME_DIR .. "src/emu/video.cpp", MAME_DIR .. "src/emu/video.h", + MAME_DIR .. "src/emu/xtal.cpp", + MAME_DIR .. "src/emu/xtal.h", MAME_DIR .. "src/emu/rendersw.hxx", MAME_DIR .. "src/emu/ui/uimain.h", MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index a88377fceec..f259664d7bb 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -397,6 +397,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/74165.h,MACHINES["TTL74165"] = true +--------------------------------------------------- + +if (MACHINES["TTL74165"]~=null) then + files { + MAME_DIR .. "src/devices/machine/74165.cpp", + MAME_DIR .. "src/devices/machine/74165.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/74166.h,MACHINES["TTL74166"] = true --------------------------------------------------- @@ -613,6 +625,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/am9519.h,MACHINES["AM9519"] = true +--------------------------------------------------- + +if (MACHINES["AM9519"]~=null) then + files { + MAME_DIR .. "src/devices/machine/am9519.cpp", + MAME_DIR .. "src/devices/machine/am9519.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/amigafdc.h,MACHINES["AMIGAFDC"] = true --------------------------------------------------- @@ -2318,6 +2342,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/rstbuf.h,MACHINES["RSTBUF"] = true +--------------------------------------------------- + +if (MACHINES["RSTBUF"]~=null) then + files { + MAME_DIR .. "src/devices/machine/rstbuf.cpp", + MAME_DIR .. "src/devices/machine/rstbuf.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/rtc4543.h,MACHINES["RTC4543"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index 452c812dd03..60e955f8773 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -29,18 +29,18 @@ includedirs { MAME_DIR .. "src/devices", -- till deps are fixed MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty/rapidjson/include", MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", } includedirs { + ext_includedir("asio"), ext_includedir("expat"), ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("flac"), - MAME_DIR .. "3rdparty/asio/include", + ext_includedir("rapidjson") } configuration { } diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 06392a6c34e..ddd2e4b06f2 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -116,7 +116,7 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp", } includedirs { - MAME_DIR .. "3rdparty/asio/include", + ext_includedir("asio"), } if _OPTIONS["targetos"]=="windows" then @@ -215,7 +215,7 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", - MAME_DIR .. "3rdparty/rapidjson/include", + ext_includedir("rapidjson") } if _OPTIONS["NO_USE_PORTAUDIO"]=="1" then diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua index 7ea441240b3..5cc75091eae 100644 --- a/docs/release/scripts/target/hbmame/hbmame.lua +++ b/docs/release/scripts/target/hbmame/hbmame.lua @@ -18,6 +18,7 @@ CPUS["ARM"] = true CPUS["ARM7"] = true CPUS["CCPU"] = true CPUS["DSP16A"] = true +CPUS["ES5510"] = true CPUS["H6280"] = true CPUS["HD6309"] = true CPUS["I8085"] = true @@ -61,6 +62,7 @@ SOUNDS["DMADAC"] = true SOUNDS["DIGITALKER"] = true SOUNDS["DISCRETE"] = true SOUNDS["ES5505"] = true +SOUNDS["ESQPUMP"] = true SOUNDS["HC55516"] = true SOUNDS["ICS2115"] = true SOUNDS["K005289"] = true @@ -156,6 +158,7 @@ MACHINES["TICKET"] = true MACHINES["TIMEKPR"] = true MACHINES["TMS1024"] = true -- docastle MACHINES["TMS6100"] = true +MACHINES["TTL74153"] = true MACHINES["TTL74157"] = true MACHINES["TTL74259"] = true MACHINES["UPD1990A"] = true @@ -305,6 +308,8 @@ files { createHBMAMEProjects(_target, _subtarget, "capcom") files { + MAME_DIR .. "src/hbmame/drivers/sf.cpp", + MAME_DIR .. "src/mame/video/sf.cpp", MAME_DIR .. "src/hbmame/drivers/1942.cpp", MAME_DIR .. "src/mame/video/1942.cpp", MAME_DIR .. "src/hbmame/drivers/blktiger.cpp", @@ -371,6 +376,7 @@ files { createHBMAMEProjects(_target, _subtarget, "igs") files { + MAME_DIR .. "src/hbmame/drivers/igs011.cpp", MAME_DIR .. "src/hbmame/drivers/pgm.cpp", MAME_DIR .. "src/mame/video/pgm.cpp", MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.cpp", @@ -429,6 +435,8 @@ files { createHBMAMEProjects(_target, _subtarget, "konami") files { + MAME_DIR .. "src/hbmame/drivers/gradius3.cpp", + MAME_DIR .. "src/mame/video/gradius3.cpp", MAME_DIR .. "src/hbmame/drivers/1943.cpp", MAME_DIR .. "src/mame/video/1943.cpp", MAME_DIR .. "src/mame/audio/hyprolyb.cpp", @@ -535,6 +543,30 @@ files { createHBMAMEProjects(_target, _subtarget, "neogeo") files { MAME_DIR .. "src/hbmame/drivers/neogeo.cpp", + MAME_DIR .. "src/hbmame/drivers/neogeohb.cpp", + MAME_DIR .. "src/hbmame/drivers/neogeo1.cpp", + MAME_DIR .. "src/hbmame/drivers/kof94.cpp", + MAME_DIR .. "src/hbmame/drivers/kof95.cpp", + MAME_DIR .. "src/hbmame/drivers/kof96.cpp", + MAME_DIR .. "src/hbmame/drivers/kof97.cpp", + MAME_DIR .. "src/hbmame/drivers/kof98.cpp", + MAME_DIR .. "src/hbmame/drivers/kof99.cpp", + MAME_DIR .. "src/hbmame/drivers/kof2000.cpp", + MAME_DIR .. "src/hbmame/drivers/kof2001.cpp", + MAME_DIR .. "src/hbmame/drivers/kof2002.cpp", + MAME_DIR .. "src/hbmame/drivers/kof2003.cpp", + MAME_DIR .. "src/hbmame/drivers/mgd2.cpp", + MAME_DIR .. "src/hbmame/drivers/mslug.cpp", + MAME_DIR .. "src/hbmame/drivers/ngdoubledr.cpp", + MAME_DIR .. "src/hbmame/drivers/nggaroup.cpp", + MAME_DIR .. "src/hbmame/drivers/ngkofmisc.cpp", + MAME_DIR .. "src/hbmame/drivers/nglastblade.cpp", + MAME_DIR .. "src/hbmame/drivers/ngrbff.cpp", + MAME_DIR .. "src/hbmame/drivers/ngrotd.cpp", + MAME_DIR .. "src/hbmame/drivers/ngsamsho.cpp", + MAME_DIR .. "src/hbmame/drivers/ngsengoku.cpp", + MAME_DIR .. "src/hbmame/drivers/ngsvc.cpp", + MAME_DIR .. "src/hbmame/drivers/ngwh.cpp", MAME_DIR .. "src/hbmame/video/neogeo.cpp", MAME_DIR .. "src/hbmame/drivers/neogeo_noslot.cpp", MAME_DIR .. "src/hbmame/video/neogeo_spr.cpp", @@ -614,12 +646,16 @@ files { createHBMAMEProjects(_target, _subtarget, "psikyo") files { + MAME_DIR .. "src/hbmame/drivers/psikyo.cpp", + MAME_DIR .. "src/mame/video/psikyo.cpp", MAME_DIR .. "src/hbmame/drivers/psikyosh.cpp", MAME_DIR .. "src/mame/video/psikyosh.cpp", } createHBMAMEProjects(_target, _subtarget, "sega") files { + MAME_DIR .. "src/hbmame/drivers/segas24.cpp", + MAME_DIR .. "src/mame/video/segas24.cpp", MAME_DIR .. "src/mame/machine/megadriv.cpp", MAME_DIR .. "src/mame/drivers/megaplay.cpp", MAME_DIR .. "src/mame/drivers/megatech.cpp", @@ -683,6 +719,11 @@ files { createHBMAMEProjects(_target, _subtarget, "taito") files { + MAME_DIR .. "src/hbmame/drivers/mexico86.cpp", + MAME_DIR .. "src/mame/machine/mexico86.cpp", + MAME_DIR .. "src/mame/video/mexico86.cpp", + MAME_DIR .. "src/hbmame/drivers/ikage.cpp", + MAME_DIR .. "src/mame/video/lkage.cpp", MAME_DIR .. "src/hbmame/drivers/arkanoid.cpp", MAME_DIR .. "src/mame/machine/arkanoid.cpp", MAME_DIR .. "src/mame/video/arkanoid.cpp", @@ -726,6 +767,11 @@ files { createHBMAMEProjects(_target, _subtarget, "tehkan") files { + MAME_DIR .. "src/hbmame/drivers/solomon.cpp", + MAME_DIR .. "src/mame/video/solomon.cpp", + MAME_DIR .. "src/hbmame/drivers/tecmosys.cpp", + MAME_DIR .. "src/mame/machine/tecmosys.cpp", + MAME_DIR .. "src/mame/video/tecmosys.cpp", MAME_DIR .. "src/mame/video/tecmo_spr.cpp", MAME_DIR .. "src/mame/video/tecmo_mix.cpp", MAME_DIR .. "src/mame/video/tecmo_mix.h", @@ -745,6 +791,8 @@ files { createHBMAMEProjects(_target, _subtarget, "toaplan") files { + MAME_DIR .. "src/hbmame/drivers/snowbros.cpp", + MAME_DIR .. "src/mame/video/snowbros.cpp", MAME_DIR .. "src/mame/drivers/toaplan1.cpp", MAME_DIR .. "src/mame/machine/toaplan1.cpp", MAME_DIR .. "src/mame/video/toaplan1.cpp", diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index 5d9b4cbccf9..72157568e4c 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -253,7 +253,7 @@ SOUNDS["YMZ770"] = true SOUNDS["MPEG_AUDIO"] = true SOUNDS["T6721A"] = true SOUNDS["MOS7360"] = true ---SOUNDS["ESQPUMP"] = true +SOUNDS["ESQPUMP"] = true --SOUNDS["VRC6"] = true SOUNDS["SB0400"] = true SOUNDS["AC97"] = true @@ -374,6 +374,7 @@ MACHINES["TTL74153"] = true MACHINES["TTL74157"] = true --MACHINES["TTL74161"] = true --MACHINES["TTL74164"] = true +MACHINES["TTL74165"] = true MACHINES["TTL74166"] = true --MACHINES["TTL74175"] = true MACHINES["TTL74181"] = true @@ -542,6 +543,7 @@ MACHINES["ROC10937"] = true MACHINES["RP5C01"] = true MACHINES["RP5C15"] = true MACHINES["RP5H01"] = true +MACHINES["RSTBUF"] = true MACHINES["RTC4543"] = true MACHINES["RTC65271"] = true MACHINES["RTC9701"] = true @@ -860,6 +862,8 @@ function createMAMEProjects(_target, _subtarget, _name) } includedirs { ext_includedir("flac"), + ext_includedir("glm"), + ext_includedir("jpeg"), } end @@ -1022,7 +1026,9 @@ files { MAME_DIR .. "src/mame/audio/avalnche.cpp", MAME_DIR .. "src/mame/drivers/badlands.cpp", MAME_DIR .. "src/mame/includes/badlands.h", + MAME_DIR .. "src/mame/machine/badlands.cpp", MAME_DIR .. "src/mame/video/badlands.cpp", + MAME_DIR .. "src/mame/drivers/badlandsbl.cpp", MAME_DIR .. "src/mame/drivers/bartop52.cpp", MAME_DIR .. "src/mame/drivers/batman.cpp", MAME_DIR .. "src/mame/includes/batman.h", @@ -1552,6 +1558,8 @@ files { MAME_DIR .. "src/mame/includes/deco32.h", MAME_DIR .. "src/mame/video/deco32.cpp", MAME_DIR .. "src/mame/video/dvi.cpp", + MAME_DIR .. "src/mame/video/deco_ace.cpp", + MAME_DIR .. "src/mame/video/deco_ace.h", MAME_DIR .. "src/mame/video/deco_zoomspr.cpp", MAME_DIR .. "src/mame/video/deco_zoomspr.h", MAME_DIR .. "src/mame/drivers/decocass.cpp", @@ -1594,8 +1602,6 @@ files { MAME_DIR .. "src/mame/audio/madalien.cpp", MAME_DIR .. "src/mame/video/madalien.cpp", MAME_DIR .. "src/mame/drivers/madmotor.cpp", - MAME_DIR .. "src/mame/includes/madmotor.h", - MAME_DIR .. "src/mame/video/madmotor.cpp", MAME_DIR .. "src/mame/drivers/metlclsh.cpp", MAME_DIR .. "src/mame/includes/metlclsh.h", MAME_DIR .. "src/mame/video/metlclsh.cpp", @@ -2306,6 +2312,7 @@ files { MAME_DIR .. "src/mame/video/konamigx.cpp", MAME_DIR .. "src/mame/drivers/konamim2.cpp", MAME_DIR .. "src/mame/drivers/konmedal.cpp", + MAME_DIR .. "src/mame/drivers/konmedal68k.cpp", MAME_DIR .. "src/mame/drivers/kontest.cpp", MAME_DIR .. "src/mame/drivers/konendev.cpp", MAME_DIR .. "src/mame/drivers/ksys573.cpp", @@ -3181,8 +3188,8 @@ files { MAME_DIR .. "src/mame/machine/segabb.h", 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/megadriv_acbl.cpp", + MAME_DIR .. "src/mame/includes/megadriv_acbl.h", MAME_DIR .. "src/mame/drivers/megaplay.cpp", MAME_DIR .. "src/mame/drivers/megatech.cpp", MAME_DIR .. "src/mame/drivers/calcune.cpp", @@ -4132,6 +4139,7 @@ files { MAME_DIR .. "src/mame/drivers/ladybug.cpp", MAME_DIR .. "src/mame/includes/ladybug.h", MAME_DIR .. "src/mame/video/ladybug.cpp", + MAME_DIR .. "src/mame/video/ladybug.h", MAME_DIR .. "src/mame/drivers/mrdo.cpp", MAME_DIR .. "src/mame/includes/mrdo.h", MAME_DIR .. "src/mame/video/mrdo.cpp", @@ -4408,11 +4416,6 @@ files { -------------------------------------------------- createMAMEProjects(_target, _subtarget, "misc") - -includedirs { - ext_includedir("jpeg"), -} - files { MAME_DIR .. "src/mame/drivers/39in1.cpp", MAME_DIR .. "src/mame/machine/pxa255.h", @@ -4462,6 +4465,7 @@ files { MAME_DIR .. "src/mame/drivers/bingoman.cpp", MAME_DIR .. "src/mame/drivers/bingor.cpp", MAME_DIR .. "src/mame/drivers/blitz68k.cpp", + MAME_DIR .. "src/mame/drivers/blocktax.cpp", MAME_DIR .. "src/mame/drivers/buster.cpp", MAME_DIR .. "src/mame/drivers/calomega.cpp", MAME_DIR .. "src/mame/includes/calomega.h", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index aaf93bdba8f..a8e353b9ef0 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -382,6 +382,7 @@ MACHINES["AM2847"] = true MACHINES["AM53CF96"] = true MACHINES["AM9513"] = true MACHINES["AM9517A"] = true +MACHINES["AM9519"] = true MACHINES["AMIGAFDC"] = true MACHINES["AT_KEYBC"] = true MACHINES["AT28C16"] = true @@ -531,6 +532,7 @@ MACHINES["ROC10937"] = true MACHINES["RP5C01"] = true MACHINES["RP5C15"] = true MACHINES["RP5H01"] = true +--MACHINES["RSTBUF"] = true MACHINES["RTC4543"] = true MACHINES["RTC65271"] = true MACHINES["RTC9701"] = true @@ -671,6 +673,7 @@ BUSES["ECBBUS"] = true BUSES["ECONET"] = true BUSES["EINSTEIN_USERPORT"] = true BUSES["ELECTRON"] = true +BUSES["ELECTRON_CART"] = true BUSES["EP64"] = true BUSES["EPSON_SIO"] = true BUSES["GAMATE"] = true @@ -720,6 +723,7 @@ BUSES["PLUS4"] = true BUSES["POFO"] = true BUSES["PSI_KEYBOARD"] = true BUSES["PSX_CONTROLLER"] = true +BUSES["PSX_PARALLEL"] = true BUSES["QL"] = true BUSES["RS232"] = true BUSES["S100"] = true @@ -1556,6 +1560,7 @@ files { createMESSProjects(_target, _subtarget, "atari") files { + MAME_DIR .. "src/mame/drivers/a2600.h", MAME_DIR .. "src/mame/drivers/a2600.cpp", MAME_DIR .. "src/mame/drivers/a7800.cpp", MAME_DIR .. "src/mame/video/maria.cpp", @@ -1573,6 +1578,7 @@ files { MAME_DIR .. "src/mame/audio/lynx.h", MAME_DIR .. "src/mame/machine/lynx.cpp", MAME_DIR .. "src/mame/drivers/pofo.cpp", + MAME_DIR .. "src/mame/drivers/tvboy.cpp", } createMESSProjects(_target, _subtarget, "att") @@ -1669,6 +1675,7 @@ files { MAME_DIR .. "src/mame/drivers/pb1000.cpp", MAME_DIR .. "src/mame/drivers/pv1000.cpp", MAME_DIR .. "src/mame/drivers/pv2000.cpp", + MAME_DIR .. "src/mame/drivers/sk1.cpp", } createMESSProjects(_target, _subtarget, "cbm") @@ -2345,6 +2352,7 @@ files { MAME_DIR .. "src/mame/drivers/jr100.cpp", MAME_DIR .. "src/mame/drivers/jr200.cpp", MAME_DIR .. "src/mame/drivers/myb3k.cpp", + MAME_DIR .. "src/mame/drivers/duet16.cpp", } createMESSProjects(_target, _subtarget, "mb") @@ -2468,6 +2476,8 @@ files { MAME_DIR .. "src/mame/machine/pce_cd.h", MAME_DIR .. "src/mame/drivers/pcfx.cpp", MAME_DIR .. "src/mame/drivers/pc6001.cpp", + MAME_DIR .. "src/mame/includes/pc6001.h", + MAME_DIR .. "src/mame/video/pc6001.cpp", MAME_DIR .. "src/mame/drivers/pc8401a.cpp", MAME_DIR .. "src/mame/includes/pc8401a.h", MAME_DIR .. "src/mame/video/pc8401a.cpp", @@ -2535,6 +2545,8 @@ files { MAME_DIR .. "src/mame/audio/vboy.cpp", MAME_DIR .. "src/mame/audio/vboy.h", MAME_DIR .. "src/mame/drivers/gamecube.cpp", + MAME_DIR .. "src/mame/machine/m6502_vtscr.cpp", + MAME_DIR .. "src/mame/machine/m6502_vtscr.h", } createMESSProjects(_target, _subtarget, "nokia") @@ -2583,7 +2595,8 @@ files { createMESSProjects(_target, _subtarget, "olympia") files { - MAME_DIR .. "src/mame/drivers/peoplepc.cpp" + MAME_DIR .. "src/mame/drivers/olyboss.cpp", + MAME_DIR .. "src/mame/drivers/peoplepc.cpp", } createMESSProjects(_target, _subtarget, "ns") @@ -2696,7 +2709,7 @@ files { MAME_DIR .. "src/mame/machine/nl_prodigy.h", } includedirs { - MAME_DIR .. "3rdparty/rapidjson/include", + ext_includedir("rapidjson"), } createMESSProjects(_target, _subtarget, "psion") @@ -2836,6 +2849,8 @@ files { MAME_DIR .. "src/mame/machine/gdrom.h", MAME_DIR .. "src/mame/drivers/megadriv.cpp", MAME_DIR .. "src/mame/includes/megadriv.h", + MAME_DIR .. "src/mame/drivers/megadriv_rad.cpp", + MAME_DIR .. "src/mame/includes/megadriv_rad.h", MAME_DIR .. "src/mame/drivers/segapico.cpp", MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp", MAME_DIR .. "src/mame/drivers/segapm.cpp", @@ -2909,6 +2924,7 @@ files { MAME_DIR .. "src/mame/drivers/x1.cpp", MAME_DIR .. "src/mame/includes/x1.h", MAME_DIR .. "src/mame/machine/x1.cpp", + MAME_DIR .. "src/mame/video/x1.cpp", MAME_DIR .. "src/mame/drivers/x1twin.cpp", MAME_DIR .. "src/mame/drivers/mz2500.cpp", MAME_DIR .. "src/mame/drivers/mz3500.cpp", @@ -3367,6 +3383,10 @@ files { MAME_DIR .. "src/mame/drivers/crvision.cpp", MAME_DIR .. "src/mame/includes/crvision.h", MAME_DIR .. "src/mame/drivers/geniusiq.cpp", + MAME_DIR .. "src/mame/drivers/vtech_unk1.cpp", + MAME_DIR .. "src/mame/drivers/vtech_unk2.cpp", + MAME_DIR .. "src/mame/drivers/vtech_eu3a12.cpp", + MAME_DIR .. "src/mame/drivers/iqunlim.cpp", MAME_DIR .. "src/mame/drivers/laser3k.cpp", MAME_DIR .. "src/mame/drivers/lcmate2.cpp", MAME_DIR .. "src/mame/drivers/pc4.cpp", @@ -3383,6 +3403,7 @@ files { MAME_DIR .. "src/mame/drivers/socrates.cpp", MAME_DIR .. "src/mame/audio/socrates.cpp", MAME_DIR .. "src/mame/audio/socrates.h", + MAME_DIR .. "src/mame/drivers/inteladv.cpp", } createMESSProjects(_target, _subtarget, "wang") @@ -3614,7 +3635,12 @@ files { MAME_DIR .. "src/mame/drivers/qvt201.cpp", MAME_DIR .. "src/mame/drivers/qvt6800.cpp", MAME_DIR .. "src/mame/drivers/rd100.cpp", - MAME_DIR .. "src/mame/drivers/radicasi.cpp", + MAME_DIR .. "src/mame/drivers/rad_eu3a14.cpp", + MAME_DIR .. "src/mame/drivers/rad_eu3a05.cpp", + MAME_DIR .. "src/mame/audio/rad_eu3a05.cpp", + MAME_DIR .. "src/mame/audio/rad_eu3a05.h", + MAME_DIR .. "src/mame/machine/rad_eu3a05gpio.cpp", + MAME_DIR .. "src/mame/machine/rad_eu3a05gpio.h", MAME_DIR .. "src/mame/drivers/rvoice.cpp", MAME_DIR .. "src/mame/drivers/sacstate.cpp", MAME_DIR .. "src/mame/drivers/sartorius.cpp", diff --git a/docs/release/scripts/target/mame/nl.lua b/docs/release/scripts/target/mame/nl.lua index c47cea4deb4..53f16ba42cc 100644 --- a/docs/release/scripts/target/mame/nl.lua +++ b/docs/release/scripts/target/mame/nl.lua @@ -114,6 +114,7 @@ function createProjects_mame_nl(_target, _subtarget) MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", + ext_includedir("rapidjson"), } files{ diff --git a/docs/release/scripts/target/mame/virtual.lua b/docs/release/scripts/target/mame/virtual.lua index ea9905cf74a..df41d5c7d70 100644 --- a/docs/release/scripts/target/mame/virtual.lua +++ b/docs/release/scripts/target/mame/virtual.lua @@ -17,6 +17,7 @@ CPUS["M6502"] = true CPUS["H6280"] = true CPUS["MCS48"] = true CPUS["Z80"] = true +CPUS["DSP16"] = true -- for qsound -------------------------------------------------- -- specify available sound cores; some of these are @@ -27,6 +28,7 @@ SOUNDS["NES_APU"] = true SOUNDS["YM2612"] = true SOUNDS["YM2151"] = true SOUNDS["YM2413"] = true +SOUNDS["YM2608"] = true SOUNDS["YM2203"] = true SOUNDS["AY8910"] = true SOUNDS["YM3526"] = true @@ -35,13 +37,16 @@ SOUNDS["YMF271"] = true SOUNDS["YMZ280B"] = true SOUNDS["C6280"] = true SOUNDS["SN76496"] = true +SOUNDS["K051649"] = true SOUNDS["K053260"] = true +SOUNDS["K054539"] = true SOUNDS["SEGAPCM"] = true SOUNDS["MULTIPCM"] = true SOUNDS["GB_SOUND"] = true SOUNDS["POKEY"] = true SOUNDS["C352"] = true SOUNDS["OKIM6295"] = true +SOUNDS["QSOUND"] = true SOUNDS["WAVE"] = true -------------------------------------------------- |