summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2018-12-26 01:01:57 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2018-12-26 01:01:57 +1100
commit796382ccc3e6520b97f321d342d9c99722ecece3 (patch)
tree06f7daa04523b4cb1ceb72ca73c395cbcccfd226 /docs/release/scripts
parent61e04eda36dcc37c60539f8d91faa0f350613432 (diff)
0.205 Release filestag205
Diffstat (limited to 'docs/release/scripts')
-rw-r--r--docs/release/scripts/genie.lua46
-rw-r--r--docs/release/scripts/src/3rdparty.lua10
-rw-r--r--docs/release/scripts/src/bus.lua8
-rw-r--r--docs/release/scripts/src/cpu.lua25
-rw-r--r--docs/release/scripts/target/hbmame/hbmame.lua9
-rw-r--r--docs/release/scripts/target/mame/arcade.lua14
-rw-r--r--docs/release/scripts/target/mame/mess.lua22
-rw-r--r--docs/release/scripts/toolchain.lua72
8 files changed, 148 insertions, 58 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua
index b11b99203d4..46a4f9310d9 100644
--- a/docs/release/scripts/genie.lua
+++ b/docs/release/scripts/genie.lua
@@ -219,7 +219,27 @@ newoption {
newoption {
trigger = "ARCHOPTS",
- description = "ARCHOPTS.",
+ description = "Additional options for target C/C++/Objective-C/Objective-C++ compilers and linker.",
+}
+
+newoption {
+ trigger = "ARCHOPTS_C",
+ description = "Additional options for target C++ compiler.",
+}
+
+newoption {
+ trigger = "ARCHOPTS_CXX",
+ description = "Additional options for target C++ compiler.",
+}
+
+newoption {
+ trigger = "ARCHOPTS_OBJC",
+ description = "Additional options for target Objective-C compiler.",
+}
+
+newoption {
+ trigger = "ARCHOPTS_OBJCXX",
+ description = "Additional options for target Objective-C++ compiler.",
}
newoption {
@@ -869,6 +889,30 @@ if _OPTIONS["ARCHOPTS"] then
}
end
+if _OPTIONS["ARCHOPTS_C"] then
+ buildoptions_c {
+ _OPTIONS["ARCHOPTS_C"]
+ }
+end
+
+if _OPTIONS["ARCHOPTS_CXX"] then
+ buildoptions_cpp {
+ _OPTIONS["ARCHOPTS_CXX"]
+ }
+end
+
+if _OPTIONS["ARCHOPTS_OBJC"] then
+ buildoptions_objc {
+ _OPTIONS["ARCHOPTS_OBJC"]
+ }
+end
+
+if _OPTIONS["ARCHOPTS_OBJCXX"] then
+ buildoptions_objcpp {
+ _OPTIONS["ARCHOPTS_OBJCXX"]
+ }
+end
+
if _OPTIONS["SHLIB"] then
buildoptions {
"-fPIC"
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua
index 7c1cc4acf4c..2ccfa749e19 100644
--- a/docs/release/scripts/src/3rdparty.lua
+++ b/docs/release/scripts/src/3rdparty.lua
@@ -1198,6 +1198,7 @@ project "bimg"
files {
MAME_DIR .. "3rdparty/bimg/src/image.cpp",
+ MAME_DIR .. "3rdparty/bimg/src/image_gnf.cpp",
}
--------------------------------------------------
@@ -1324,12 +1325,10 @@ end
files {
MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp",
MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/dxgi.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_egl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_glx.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/hmd.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/hmd_openvr.cpp",
MAME_DIR .. "3rdparty/bgfx/src/nvapi.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp",
@@ -1347,8 +1346,9 @@ end
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui_draw.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/dear-imgui/imgui_widgets.cpp",
}
if _OPTIONS["targetos"]=="macosx" then
files {
diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua
index c16acbe2dde..dc6bbd80a91 100644
--- a/docs/release/scripts/src/bus.lua
+++ b/docs/release/scripts/src/bus.lua
@@ -349,8 +349,12 @@ if (BUSES["BBC_1MHZBUS"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/1mhzbus.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebsid.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/beebsid.h",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/emrmidi.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/emrmidi.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ieee488.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ieee488.h",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.cpp",
+ MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp",
@@ -3055,6 +3059,8 @@ if (BUSES["ZORRO"]~=null) then
MAME_DIR .. "src/devices/bus/amiga/zorro/cards.h",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.cpp",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.h",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.cpp",
+ MAME_DIR .. "src/devices/bus/amiga/zorro/a2058.h",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.cpp",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2065.h",
MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.cpp",
@@ -3472,6 +3478,8 @@ if (BUSES["HP9845_IO"]~=null) then
files {
MAME_DIR .. "src/devices/bus/hp9845_io/hp9845_io.cpp",
MAME_DIR .. "src/devices/bus/hp9845_io/hp9845_io.h",
+ MAME_DIR .. "src/devices/bus/hp9845_io/98032.cpp",
+ MAME_DIR .. "src/devices/bus/hp9845_io/98032.h",
MAME_DIR .. "src/devices/bus/hp9845_io/98034.cpp",
MAME_DIR .. "src/devices/bus/hp9845_io/98034.h",
MAME_DIR .. "src/devices/bus/hp9845_io/98035.cpp",
diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua
index f8503ac9056..08fe95f7f68 100644
--- a/docs/release/scripts/src/cpu.lua
+++ b/docs/release/scripts/src/cpu.lua
@@ -66,6 +66,26 @@ if (CPUS["8X300"]~=null or _OPTIONS["with-tools"]) then
end
--------------------------------------------------
+-- 3DO Don's Super Performing Processor (DSPP)
+--@src/devices/cpu/dspp/dspp.h,CPUS["DSPP"] = true
+--------------------------------------------------
+
+if (CPUS["DSPP"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/dspp/dspp.cpp",
+ MAME_DIR .. "src/devices/cpu/dspp/dspp.h",
+ MAME_DIR .. "src/devices/cpu/dspp/dsppdrc.cpp",
+ MAME_DIR .. "src/devices/cpu/dspp/dsppfe.cpp",
+ MAME_DIR .. "src/devices/cpu/dspp/dsppfe.h",
+ }
+end
+
+if (CPUS["DSPP"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dspp/dsppdasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dspp/dsppdasm.h")
+end
+
+--------------------------------------------------
-- ARCangent A4
--@src/devices/cpu/arc/arc.h,CPUS["ARC"] = true
--------------------------------------------------
@@ -988,12 +1008,16 @@ if (CPUS["MCS51"]~=null) then
MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp",
MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h",
MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.hxx",
+ MAME_DIR .. "src/devices/cpu/mcs51/axc51-core.cpp",
+ MAME_DIR .. "src/devices/cpu/mcs51/axc51-core.h",
}
end
if (CPUS["MCS51"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.h")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/axc51-core_dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/axc51-core_dasm.h")
end
--------------------------------------------------
@@ -1073,6 +1097,7 @@ if (CPUS["I386"]~=null) then
MAME_DIR .. "src/devices/cpu/i386/pentops.hxx",
MAME_DIR .. "src/devices/cpu/i386/x87ops.hxx",
MAME_DIR .. "src/devices/cpu/i386/x87priv.h",
+ MAME_DIR .. "src/devices/cpu/i386/cpuidmsrs.hxx",
}
end
diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua
index 591866bbbb5..ea239f09cf2 100644
--- a/docs/release/scripts/target/hbmame/hbmame.lua
+++ b/docs/release/scripts/target/hbmame/hbmame.lua
@@ -334,6 +334,11 @@ createHBMAMEProjects(_target, _subtarget, "atari")
files {
MAME_DIR .. "src/hbmame/drivers/asteroid.cpp",
MAME_DIR .. "src/mame/machine/asteroid.cpp",
+ MAME_DIR .. "src/hbmame/drivers/atarig42.cpp",
+ MAME_DIR .. "src/mame/video/atarig42.cpp",
+ MAME_DIR .. "src/mame/machine/asic65.cpp",
+ MAME_DIR .. "src/mame/video/atarirle.cpp",
+ MAME_DIR .. "src/mame/audio/atarijsa.cpp",
MAME_DIR .. "src/hbmame/drivers/atarisy1.cpp",
MAME_DIR .. "src/mame/video/atarisy1.cpp",
MAME_DIR .. "src/mame/audio/asteroid.cpp",
@@ -351,6 +356,8 @@ files {
MAME_DIR .. "src/mame/audio/llander.cpp",
MAME_DIR .. "src/mame/video/atarimo.cpp",
MAME_DIR .. "src/mame/video/avgdvg.cpp",
+ MAME_DIR .. "src/hbmame/drivers/mhavoc.cpp",
+ MAME_DIR .. "src/mame/machine/mhavoc.cpp",
}
createHBMAMEProjects(_target, _subtarget, "atlus")
@@ -614,7 +621,7 @@ files {
MAME_DIR .. "src/mame/video/xevious.cpp",
MAME_DIR .. "src/hbmame/drivers/galaxian.cpp",
MAME_DIR .. "src/mame/audio/galaxian.cpp",
- MAME_DIR .. "src/hbmame/video/galaxian.cpp",
+ MAME_DIR .. "src/mame/video/galaxian.cpp",
MAME_DIR .. "src/hbmame/drivers/mappy.cpp",
MAME_DIR .. "src/mame/video/mappy.cpp",
MAME_DIR .. "src/hbmame/drivers/pacland.cpp",
diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua
index 2c2dca39817..e7549a60042 100644
--- a/docs/release/scripts/target/mame/arcade.lua
+++ b/docs/release/scripts/target/mame/arcade.lua
@@ -132,6 +132,7 @@ CPUS["HMCS40"] = true
--CPUS["HPHYBRID"] = true
--CPUS["SM510"] = true
CPUS["ST62XX"] = true
+CPUS["DSPP"] = true
--------------------------------------------------
-- specify available sound cores
@@ -1678,6 +1679,7 @@ files {
MAME_DIR .. "src/mame/drivers/vaportra.cpp",
MAME_DIR .. "src/mame/includes/vaportra.h",
MAME_DIR .. "src/mame/video/vaportra.cpp",
+ MAME_DIR .. "src/mame/drivers/wacky_gator.cpp",
MAME_DIR .. "src/mame/machine/deco_irq.cpp",
MAME_DIR .. "src/mame/machine/deco_irq.h",
MAME_DIR .. "src/mame/machine/deco102.cpp",
@@ -1749,7 +1751,7 @@ files {
MAME_DIR .. "src/mame/drivers/stlforce.cpp",
MAME_DIR .. "src/mame/includes/stlforce.h",
MAME_DIR .. "src/mame/video/edevices.cpp",
- MAME_DIR .. "src/mame/video/edevices.h",
+ MAME_DIR .. "src/mame/video/edevices.h",
MAME_DIR .. "src/mame/drivers/mugsmash.cpp",
MAME_DIR .. "src/mame/includes/mugsmash.h",
MAME_DIR .. "src/mame/video/mugsmash.cpp",
@@ -2359,6 +2361,10 @@ files {
MAME_DIR .. "src/mame/machine/konamigx.cpp",
MAME_DIR .. "src/mame/video/konamigx.cpp",
MAME_DIR .. "src/mame/drivers/konamim2.cpp",
+ MAME_DIR .. "src/mame/machine/3dom2.cpp",
+ MAME_DIR .. "src/mame/machine/3dom2.h",
+ MAME_DIR .. "src/mame/video/3dom2_te.cpp",
+ MAME_DIR .. "src/mame/video/3dom2_te.h",
MAME_DIR .. "src/mame/drivers/konblands.cpp",
MAME_DIR .. "src/mame/drivers/konmedal.cpp",
MAME_DIR .. "src/mame/drivers/konmedal68k.cpp",
@@ -2708,6 +2714,8 @@ files {
MAME_DIR .. "src/mame/audio/midway.h",
MAME_DIR .. "src/mame/audio/csd.cpp",
MAME_DIR .. "src/mame/audio/csd.h",
+ MAME_DIR .. "src/mame/audio/sente6vb.cpp",
+ MAME_DIR .. "src/mame/audio/sente6vb.h",
}
createMAMEProjects(_target, _subtarget, "namco")
@@ -3469,6 +3477,7 @@ files {
MAME_DIR .. "src/mame/machine/xbox.cpp",
MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
MAME_DIR .. "src/mame/machine/xbox_pci.cpp",
+ MAME_DIR .. "src/mame/drivers/flashbeats.cpp",
}
createMAMEProjects(_target, _subtarget, "seibu")
@@ -4731,6 +4740,7 @@ files {
MAME_DIR .. "src/mame/drivers/midas.cpp",
MAME_DIR .. "src/mame/drivers/mil4000.cpp",
MAME_DIR .. "src/mame/drivers/miniboy7.cpp",
+ MAME_DIR .. "src/mame/drivers/minivideo.cpp",
MAME_DIR .. "src/mame/drivers/mirax.cpp",
MAME_DIR .. "src/mame/drivers/mjsenpu.cpp",
MAME_DIR .. "src/mame/drivers/mole.cpp",
@@ -4793,6 +4803,7 @@ files {
MAME_DIR .. "src/mame/drivers/re900.cpp",
MAME_DIR .. "src/mame/drivers/rgum.cpp",
MAME_DIR .. "src/mame/drivers/roul.cpp",
+ MAME_DIR .. "src/mame/drivers/rulechan.cpp",
MAME_DIR .. "src/mame/drivers/savquest.cpp",
MAME_DIR .. "src/mame/drivers/sanremo.cpp",
MAME_DIR .. "src/mame/drivers/sanremmg.cpp",
@@ -4867,7 +4878,6 @@ files {
MAME_DIR .. "src/mame/drivers/vroulet.cpp",
MAME_DIR .. "src/mame/drivers/wildpkr.cpp",
MAME_DIR .. "src/mame/drivers/wms.cpp",
- MAME_DIR .. "src/mame/drivers/wacky_gator.cpp",
MAME_DIR .. "src/mame/drivers/xtom3d.cpp",
MAME_DIR .. "src/mame/drivers/xyonix.cpp",
MAME_DIR .. "src/mame/includes/xyonix.h",
diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua
index 8e4ba283ab3..753c100681b 100644
--- a/docs/release/scripts/target/mame/mess.lua
+++ b/docs/release/scripts/target/mame/mess.lua
@@ -136,6 +136,7 @@ CPUS["MB86901"] = true
CPUS["NANOPROCESSOR"] = true
CPUS["CLIPPER"] = true
CPUS["CAPRICORN"] = true
+--CPUS["DSPP"] = true
--------------------------------------------------
-- specify available sound cores; some of these are
@@ -1106,6 +1107,7 @@ function linkProjects_mame_mess(_target, _subtarget)
"mos",
"motorola",
"multitch",
+ "mupid",
"nakajima",
"nascom",
"ncd",
@@ -2248,6 +2250,8 @@ files {
MAME_DIR .. "src/mame/machine/hp9825_tape.h",
MAME_DIR .. "src/mame/machine/hp9845_printer.cpp",
MAME_DIR .. "src/mame/machine/hp9845_printer.h",
+ MAME_DIR .. "src/mame/machine/hp98x5_io_sys.cpp",
+ MAME_DIR .. "src/mame/machine/hp98x5_io_sys.h",
MAME_DIR .. "src/mame/video/hp48.cpp",
MAME_DIR .. "src/mame/drivers/hp49gp.cpp",
MAME_DIR .. "src/mame/drivers/hp9845.cpp",
@@ -2260,6 +2264,7 @@ files {
MAME_DIR .. "src/mame/drivers/hp2620.cpp",
MAME_DIR .. "src/mame/drivers/hp700.cpp",
MAME_DIR .. "src/mame/drivers/hp2640.cpp",
+ MAME_DIR .. "src/mame/drivers/hp95lx.cpp",
MAME_DIR .. "src/mame/drivers/hp9825.cpp",
}
@@ -2503,6 +2508,8 @@ createMESSProjects(_target, _subtarget, "mips")
files {
MAME_DIR .. "src/mame/drivers/mips.cpp",
MAME_DIR .. "src/mame/includes/mips.h",
+ MAME_DIR .. "src/mame/machine/mips_rambo.h",
+ MAME_DIR .. "src/mame/machine/mips_rambo.cpp",
}
createMESSProjects(_target, _subtarget, "mit")
@@ -2561,6 +2568,12 @@ files {
MAME_DIR .. "src/mame/includes/mpf1.h",
}
+createMESSProjects(_target, _subtarget, "mupid")
+files {
+ MAME_DIR .. "src/mame/drivers/mdisk.cpp",
+ MAME_DIR .. "src/mame/drivers/mupid2.cpp",
+}
+
createMESSProjects(_target, _subtarget, "nakajima")
files {
MAME_DIR .. "src/mame/drivers/nakajies.cpp",
@@ -3050,6 +3063,7 @@ files {
MAME_DIR .. "src/mame/includes/mz700.h",
MAME_DIR .. "src/mame/drivers/pc1500.cpp",
MAME_DIR .. "src/mame/drivers/pocketc.cpp",
+ MAME_DIR .. "src/mame/machine/pocketc.cpp",
MAME_DIR .. "src/mame/includes/pocketc.h",
MAME_DIR .. "src/mame/video/pc1401.cpp",
MAME_DIR .. "src/mame/machine/pc1401.cpp",
@@ -3286,6 +3300,7 @@ files {
MAME_DIR .. "src/mame/drivers/tv965.cpp",
MAME_DIR .. "src/mame/drivers/tv990.cpp",
MAME_DIR .. "src/mame/drivers/ts3000.cpp",
+ MAME_DIR .. "src/mame/machine/tv955kb.cpp",
}
createMESSProjects(_target, _subtarget, "tem")
@@ -3593,6 +3608,7 @@ files {
MAME_DIR .. "src/mame/audio/socrates.cpp",
MAME_DIR .. "src/mame/audio/socrates.h",
MAME_DIR .. "src/mame/drivers/inteladv.cpp",
+ MAME_DIR .. "src/mame/drivers/vsmile.cpp",
}
createMESSProjects(_target, _subtarget, "wang")
@@ -3697,6 +3713,7 @@ files {
MAME_DIR .. "src/mame/includes/busicom.h",
MAME_DIR .. "src/mame/video/busicom.cpp",
MAME_DIR .. "src/mame/drivers/candela.cpp",
+ MAME_DIR .. "src/mame/drivers/cardinal.cpp",
MAME_DIR .. "src/mame/drivers/chaos.cpp",
MAME_DIR .. "src/mame/drivers/chesstrv.cpp",
MAME_DIR .. "src/mame/drivers/cd2650.cpp",
@@ -3736,6 +3753,7 @@ files {
MAME_DIR .. "src/mame/drivers/eacc.cpp",
MAME_DIR .. "src/mame/drivers/elwro800.cpp",
MAME_DIR .. "src/mame/drivers/emate.cpp",
+ MAME_DIR .. "src/mame/drivers/epic14e.cpp",
MAME_DIR .. "src/mame/drivers/esprit.cpp",
MAME_DIR .. "src/mame/drivers/eti660.cpp",
MAME_DIR .. "src/mame/includes/eti660.h",
@@ -3748,6 +3766,7 @@ files {
MAME_DIR .. "src/mame/drivers/fanucspmg.cpp",
MAME_DIR .. "src/mame/drivers/fc100.cpp",
MAME_DIR .. "src/mame/drivers/fk1.cpp",
+ MAME_DIR .. "src/mame/drivers/fs3216.cpp",
MAME_DIR .. "src/mame/drivers/ft68m.cpp",
MAME_DIR .. "src/mame/drivers/gameking.cpp",
MAME_DIR .. "src/mame/drivers/gimix.cpp",
@@ -3756,6 +3775,7 @@ files {
MAME_DIR .. "src/mame/drivers/harriet.cpp",
MAME_DIR .. "src/mame/drivers/hazeltin.cpp",
MAME_DIR .. "src/mame/drivers/hazl1420.cpp",
+ MAME_DIR .. "src/mame/drivers/hp3478a.cpp",
MAME_DIR .. "src/mame/drivers/hprot1.cpp",
MAME_DIR .. "src/mame/drivers/hpz80unk.cpp",
MAME_DIR .. "src/mame/drivers/ht68k.cpp",
@@ -3804,6 +3824,7 @@ files {
MAME_DIR .. "src/mame/drivers/mod8.cpp",
MAME_DIR .. "src/mame/drivers/modellot.cpp",
MAME_DIR .. "src/mame/drivers/molecular.cpp",
+ MAME_DIR .. "src/mame/drivers/monon_color.cpp",
MAME_DIR .. "src/mame/drivers/ms0515.cpp",
MAME_DIR .. "src/mame/drivers/ms9540.cpp",
MAME_DIR .. "src/mame/drivers/mstation.cpp",
@@ -3849,6 +3870,7 @@ files {
MAME_DIR .. "src/mame/drivers/sh4robot.cpp",
MAME_DIR .. "src/mame/drivers/sansa_fuze.cpp",
MAME_DIR .. "src/mame/drivers/scopus.cpp",
+ MAME_DIR .. "src/mame/drivers/shine.cpp",
MAME_DIR .. "src/mame/drivers/si5500.cpp",
MAME_DIR .. "src/mame/drivers/softbox.cpp",
MAME_DIR .. "src/mame/includes/softbox.h",
diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua
index f270d3f69b8..e596c06bfb0 100644
--- a/docs/release/scripts/toolchain.lua
+++ b/docs/release/scripts/toolchain.lua
@@ -16,13 +16,14 @@ newoption {
description = "Choose GCC flavor",
allowed = {
{ "android-arm", "Android - ARM" },
- { "android-arm64", "Android - ARM64" },
+ { "android-arm64", "Android - ARM64" },
{ "android-mips", "Android - MIPS" },
{ "android-mips64","Android - MIPS64" },
{ "android-x86", "Android - x86" },
{ "android-x64", "Android - x64" },
{ "asmjs", "Emscripten/asm.js" },
{ "freebsd", "FreeBSD" },
+ { "freebsd-clang", "FreeBSD (clang compiler)"},
{ "linux-gcc", "Linux (GCC compiler)" },
{ "linux-clang", "Linux (Clang compiler)" },
{ "ios-arm", "iOS - ARM" },
@@ -31,6 +32,7 @@ newoption {
{ "mingw64-gcc", "MinGW64" },
{ "mingw-clang", "MinGW (clang compiler)" },
{ "netbsd", "NetBSD" },
+ { "netbsd-clang", "NetBSD (clang compiler)"},
{ "openbsd", "OpenBSD" },
{ "osx", "OSX (GCC compiler)" },
{ "osx-clang", "OSX (Clang compiler)" },
@@ -92,11 +94,11 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION)
- local androidPlatform = "android-21"
+ local androidPlatform = "android-24"
if _OPTIONS["with-android"] then
androidPlatform = "android-" .. _OPTIONS["with-android"]
elseif _OPTIONS["PLATFORM"]:find("64", -2) then
- androidPlatform = "android-21"
+ androidPlatform = "android-24"
end
local iosPlatform = ""
@@ -168,10 +170,18 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd")
end
+ if "freebsd-clang" == _OPTIONS["gcc"] then
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd-clang")
+ end
+
if "netbsd" == _OPTIONS["gcc"] then
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd")
end
+ if "netbsd-clang" == _OPTIONS["gcc"] then
+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd-clang")
+ end
+
if "openbsd" == _OPTIONS["gcc"] then
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-openbsd")
end
@@ -837,6 +847,7 @@ function toolchain(_buildDir, _subDir)
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include",
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/include",
+ "$(ANDROID_NDK_ROOT)/sysroot/usr/include",
"$(ANDROID_NDK_ROOT)/sources/android/support/include",
"$(ANDROID_NDK_ROOT)/sources/android/native_app_glue",
}
@@ -854,10 +865,12 @@ function toolchain(_buildDir, _subDir)
"log",
"c++_static",
"c++abi",
- "android_support",
"stdc++",
"gcc",
}
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ }
buildoptions {
"-fpic",
"-ffunction-sections",
@@ -870,6 +883,8 @@ function toolchain(_buildDir, _subDir)
"-Wno-cast-align",
"-Wno-unknown-attributes",
"-Wno-macro-redefined",
+ "-DASIO_HAS_STD_STRING_VIEW",
+ "-Wno-unused-function",
}
linkoptions {
"-no-canonical-prefixes",
@@ -883,11 +898,10 @@ function toolchain(_buildDir, _subDir)
configuration { "android-arm" }
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a",
- "$(ANDROID_NDK_ARM)/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib",
}
includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/include",
+ "$(ANDROID_NDK_ROOT)/sysroot/usr/include/arm-linux-androideabi",
}
buildoptions {
"-gcc-toolchain $(ANDROID_NDK_ARM)",
@@ -916,7 +930,7 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64",
}
includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/include",
+ "$(ANDROID_NDK_ROOT)/sysroot/usr/include/aarch64-linux-android",
}
buildoptions {
"-gcc-toolchain $(ANDROID_NDK_ARM64)",
@@ -930,53 +944,13 @@ function toolchain(_buildDir, _subDir)
"-target aarch64-none-linux-android",
}
- configuration { "android-mips" }
- libdirs {
- "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips",
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/",
- }
- includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/include",
- }
- buildoptions {
- "-gcc-toolchain $(ANDROID_NDK_MIPS)",
- "-target mipsel-none-linux-android",
- }
- linkoptions {
- "-gcc-toolchain $(ANDROID_NDK_MIPS)",
- "-target mipsel-none-linux-android",
- "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips",
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o",
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o",
- }
-
- configuration { "android-mips64" }
- libdirs {
- "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64",
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/",
- }
- includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/include",
- }
- buildoptions {
- "-gcc-toolchain $(ANDROID_NDK_MIPS64)",
- "-target mips64el-none-linux-android",
- }
- linkoptions {
- "-gcc-toolchain $(ANDROID_NDK_MIPS64)",
- "-target mips64el-none-linux-android",
- "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64",
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtbegin_so.o",
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtend_so.o",
- }
-
configuration { "android-x86" }
libdirs {
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib",
}
includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/include",
+ "$(ANDROID_NDK_ROOT)/sysroot/usr/include/i686-linux-android",
}
buildoptions {
"-gcc-toolchain $(ANDROID_NDK_X86)",
@@ -998,7 +972,7 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64",
}
includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/include",
+ "$(ANDROID_NDK_ROOT)/sysroot/usr/include/x86_64-linux-android",
}
buildoptions {
"-gcc-toolchain $(ANDROID_NDK_X64)",