summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua17
-rw-r--r--scripts/resources/emscripten/emscripten_post.js10
-rw-r--r--scripts/resources/windows/mame/mame.icobin0 -> 372526 bytes
-rw-r--r--scripts/resources/windows/mame/mame.man15
-rw-r--r--scripts/resources/windows/mame/mame.rc14
-rw-r--r--scripts/resources/windows/mess/mess.icobin0 -> 372526 bytes
-rw-r--r--scripts/resources/windows/mess/mess.man15
-rw-r--r--scripts/resources/windows/mess/mess.rc14
-rw-r--r--scripts/src/3rdparty.lua97
-rw-r--r--scripts/src/bus.lua21
-rw-r--r--scripts/src/cpu.lua6
-rw-r--r--scripts/src/emu.lua16
-rw-r--r--scripts/src/lib.lua1
-rw-r--r--scripts/src/main.lua9
-rw-r--r--scripts/src/osd/modules.lua28
-rw-r--r--scripts/src/osd/osdmini.lua4
-rw-r--r--scripts/src/osd/sdl.lua123
-rw-r--r--scripts/src/osd/windows.lua34
-rw-r--r--scripts/src/sound.lua10
-rw-r--r--scripts/src/tools.lua42
-rw-r--r--scripts/target/mame/arcade.lua15
-rw-r--r--scripts/target/mame/mess.lua2
-rw-r--r--scripts/target/mame/nl.lua16
23 files changed, 315 insertions, 194 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 08cf0aa381d..a3c59ca7462 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -16,6 +16,14 @@ MAME_DIR = (path.getabsolute("..") .. "/")
local MAME_BUILD_DIR = (MAME_DIR .. _OPTIONS["build-dir"] .. "/")
local naclToolchain = ""
+newoption {
+ trigger = "precompile",
+ description = "Precompiled headers generation.",
+ allowed = {
+ { "0", "Disabled" },
+ { "1", "Enabled" },
+ }
+}
function backtick(cmd)
result = string.gsub(string.gsub(os.outputof(cmd), "\r?\n$", ""), " $", "")
@@ -57,9 +65,11 @@ function layoutbuildtask(_folder, _name)
end
function precompiledheaders()
- configuration { "not xcode4" }
- pchheader("emu.h")
- configuration { }
+ if _OPTIONS["precompile"]==nil or (_OPTIONS["precompile"]~=nil and _OPTIONS["precompile"]=="1") then
+ configuration { "not xcode4" }
+ pchheader("emu.h")
+ configuration { }
+ end
end
function addprojectflags()
@@ -943,6 +953,7 @@ end
"-Wno-inline-new-delete",
"-Wno-constant-logical-operand",
"-Wno-deprecated-register",
+ "-fdiagnostics-show-note-include-stack",
}
if (version >= 30500) then
buildoptions {
diff --git a/scripts/resources/emscripten/emscripten_post.js b/scripts/resources/emscripten/emscripten_post.js
new file mode 100644
index 00000000000..6bfad8790cb
--- /dev/null
+++ b/scripts/resources/emscripten/emscripten_post.js
@@ -0,0 +1,10 @@
+// MAME-JavaScript function mappings
+var JSMAME = JSMAME || {};
+JSMAME.get_machine = Module.cwrap('_Z14js_get_machinev', 'number');
+JSMAME.get_ui = Module.cwrap('_Z9js_get_uiv', 'number');
+JSMAME.get_sound = Module.cwrap('_Z12js_get_soundv', 'number');
+JSMAME.ui_set_show_fps = Module.cwrap('_ZN10ui_manager12set_show_fpsEb', '', ['number', 'number']);
+JSMAME.ui_get_show_fps = Module.cwrap('_ZNK10ui_manager8show_fpsEv', 'number', ['number']);
+JSMAME.sound_manager_mute = Module.cwrap('_ZN13sound_manager4muteEbh', '', ['number', 'number', 'number']);
+JSMAME.sdl_pauseaudio = Module.cwrap('SDL_PauseAudio', '', ['number']);
+var JSMESS = JSMAME;
diff --git a/scripts/resources/windows/mame/mame.ico b/scripts/resources/windows/mame/mame.ico
new file mode 100644
index 00000000000..62761447fc2
--- /dev/null
+++ b/scripts/resources/windows/mame/mame.ico
Binary files differ
diff --git a/scripts/resources/windows/mame/mame.man b/scripts/resources/windows/mame/mame.man
new file mode 100644
index 00000000000..e08eba181cb
--- /dev/null
+++ b/scripts/resources/windows/mame/mame.man
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MAME" type="win32" />
+ <description>Multiple Arcade Machine Emulator</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
+ </dependentAssembly>
+ </dependency>
+ <asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
diff --git a/scripts/resources/windows/mame/mame.rc b/scripts/resources/windows/mame/mame.rc
new file mode 100644
index 00000000000..8156b424c64
--- /dev/null
+++ b/scripts/resources/windows/mame/mame.rc
@@ -0,0 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+//============================================================
+//
+// mame.rc - Minimal resource file for Win32 MAME
+//
+//============================================================
+
+#include <windows.h>
+#include "mamevers.rc"
+
+1 24 MOVEABLE PURE "mame.man"
+
+2 ICON DISCARDABLE "mame.ico"
diff --git a/scripts/resources/windows/mess/mess.ico b/scripts/resources/windows/mess/mess.ico
new file mode 100644
index 00000000000..bab67dd6195
--- /dev/null
+++ b/scripts/resources/windows/mess/mess.ico
Binary files differ
diff --git a/scripts/resources/windows/mess/mess.man b/scripts/resources/windows/mess/mess.man
new file mode 100644
index 00000000000..67ba3aced37
--- /dev/null
+++ b/scripts/resources/windows/mess/mess.man
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MESS" type="win32" />
+ <description>Multi Emulator Super System</description>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
+ </dependentAssembly>
+ </dependency>
+ <asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
+</assembly>
diff --git a/scripts/resources/windows/mess/mess.rc b/scripts/resources/windows/mess/mess.rc
new file mode 100644
index 00000000000..1329bcd6fb8
--- /dev/null
+++ b/scripts/resources/windows/mess/mess.rc
@@ -0,0 +1,14 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+//============================================================
+//
+// mess.rc - Minimal resource file for Win32 MAME
+//
+//============================================================
+
+#include <windows.h>
+#include "messvers.rc"
+
+1 24 MOVEABLE PURE "mess.man"
+
+2 ICON DISCARDABLE "mess.ico"
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 30cb3770a4a..26d5c687cd0 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -18,6 +18,34 @@ project "expat"
uuid "f4cd40b1-c37c-452d-9785-640f26f0bf54"
kind "StaticLib"
+ -- fake out the enough of expat_config.h to get by
+ defines {
+ "HAVE_MEMMOVE",
+ "HAVE_STDINT_H",
+ "HAVE_STDLIB_H",
+ "HAVE_STRING_H",
+ "PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"",
+ "PACKAGE_NAME=\"expat\"",
+ "PACKAGE_STRING=\"expat 2.1.1\"",
+ "PACKAGE_TARNAME=\"expat\"",
+ "PACKAGE_URL=\"\"",
+ "PACKAGE_VERSION=\"2.1.1\"",
+ "STDC_HEADERS",
+ "XML_CONTEXT_BYTES=1024",
+ "XML_DTD",
+ "XML_NS",
+ }
+if _OPTIONS["BIGENDIAN"]=="1" then
+ defines {
+ "BYTEORDER=4321",
+ "WORDS_BIGENDIAN",
+ }
+else
+ defines {
+ "BYTEORDER=1234",
+ }
+end
+
configuration { "vs*" }
buildoptions {
"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
@@ -271,7 +299,7 @@ end
"HAVE_CONFIG_H=1",
}
- configuration { "gmake"}
+ configuration { "gmake" }
buildoptions_c {
"-Wno-unused-function",
"-O0",
@@ -324,6 +352,17 @@ project "7z"
uuid "ad573d62-e76a-4b11-ae34-5110a6789a42"
kind "StaticLib"
+ configuration { "gmake" }
+ buildoptions_c {
+ "-Wno-undef",
+ "-Wno-strict-prototypes",
+ }
+
+ configuration { "mingw*" }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ }
+
configuration { "vs*" }
buildoptions {
"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
@@ -346,24 +385,47 @@ end
}
files {
+ MAME_DIR .. "3rdparty/lzma/C/7zAlloc.c",
+ MAME_DIR .. "3rdparty/lzma/C/7zArcIn.c",
MAME_DIR .. "3rdparty/lzma/C/7zBuf.c",
MAME_DIR .. "3rdparty/lzma/C/7zBuf2.c",
MAME_DIR .. "3rdparty/lzma/C/7zCrc.c",
MAME_DIR .. "3rdparty/lzma/C/7zCrcOpt.c",
MAME_DIR .. "3rdparty/lzma/C/7zDec.c",
- MAME_DIR .. "3rdparty/lzma/C/7zIn.c",
+ MAME_DIR .. "3rdparty/lzma/C/7zFile.c",
+ MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
+ MAME_DIR .. "3rdparty/lzma/C/Aes.c",
+ MAME_DIR .. "3rdparty/lzma/C/AesOpt.c",
+ MAME_DIR .. "3rdparty/lzma/C/Alloc.c",
+ MAME_DIR .. "3rdparty/lzma/C/Bcj2.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/Bcj2Enc.c",
+ MAME_DIR .. "3rdparty/lzma/C/Bra.c",
+ MAME_DIR .. "3rdparty/lzma/C/Bra86.c",
+ MAME_DIR .. "3rdparty/lzma/C/BraIA64.c",
MAME_DIR .. "3rdparty/lzma/C/CpuArch.c",
- MAME_DIR .. "3rdparty/lzma/C/LzmaDec.c",
+ MAME_DIR .. "3rdparty/lzma/C/Delta.c",
+ MAME_DIR .. "3rdparty/lzma/C/LzFind.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/LzFindMt.c",
MAME_DIR .. "3rdparty/lzma/C/Lzma2Dec.c",
- MAME_DIR .. "3rdparty/lzma/C/LzmaEnc.c",
MAME_DIR .. "3rdparty/lzma/C/Lzma2Enc.c",
- MAME_DIR .. "3rdparty/lzma/C/LzFind.c",
- MAME_DIR .. "3rdparty/lzma/C/Bra.c",
- MAME_DIR .. "3rdparty/lzma/C/Bra86.c",
- MAME_DIR .. "3rdparty/lzma/C/Bcj2.c",
+ MAME_DIR .. "3rdparty/lzma/C/Lzma86Dec.c",
+ MAME_DIR .. "3rdparty/lzma/C/Lzma86Enc.c",
+ MAME_DIR .. "3rdparty/lzma/C/LzmaDec.c",
+ MAME_DIR .. "3rdparty/lzma/C/LzmaEnc.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/LzmaLib.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/MtCoder.c",
MAME_DIR .. "3rdparty/lzma/C/Ppmd7.c",
MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c",
- MAME_DIR .. "3rdparty/lzma/C/7zStream.c",
+ MAME_DIR .. "3rdparty/lzma/C/Ppmd7Enc.c",
+ MAME_DIR .. "3rdparty/lzma/C/Sha256.c",
+ MAME_DIR .. "3rdparty/lzma/C/Sort.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/Threads.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/Xz.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzCrc64.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzCrc64Opt.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzDec.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzEnc.c",
+ -- MAME_DIR .. "3rdparty/lzma/C/XzIn.c",
}
--------------------------------------------------
@@ -720,6 +782,7 @@ end
buildoptions {
"-Wno-uninitialized",
"-Wno-unused-function",
+ "-Wno-unused-but-set-variable",
}
configuration { "rpi" }
buildoptions {
@@ -765,14 +828,15 @@ end
MAME_DIR .. "3rdparty/bgfx/src/glcontext_ppapi.cpp",
MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/image.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/ovr.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/hmd_openvr.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d9.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_gl.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp",
MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp",
- MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp",
MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp",
@@ -788,8 +852,17 @@ end
MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp",
+ MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/ocornut_imgui.cpp",
+ MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/scintilla.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/ib-compress/indexbuffercompression.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbufferdecompression.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_demo.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_node_graph_test.cpp",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_wm.cpp",
}
if _OPTIONS["targetos"]=="macosx" then
files {
@@ -1187,7 +1260,7 @@ if _OPTIONS["targetos"]=="android" then
"log",
}
linkoptions {
- "-Wl,-soname,liSDL2.so"
+ "-Wl,-soname,libSDL2.so"
}
if _OPTIONS["SEPARATE_BIN"]~="1" then
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 5423c224127..43a86be74c2 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -705,6 +705,23 @@ end
---------------------------------------------------
--
+--@src/devices/bus/intv/slot.h,BUSES["INTV_CTRL"] = true
+---------------------------------------------------
+
+if (BUSES["INTV_CTRL"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/intv_ctrl/ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/intv_ctrl/ctrl.h",
+ MAME_DIR .. "src/devices/bus/intv_ctrl/handctrl.cpp",
+ MAME_DIR .. "src/devices/bus/intv_ctrl/handctrl.h",
+ MAME_DIR .. "src/devices/bus/intv_ctrl/ecs_ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/intv_ctrl/ecs_ctrl.h",
+ }
+end
+
+
+---------------------------------------------------
+--
--@src/devices/bus/isa/isa.h,BUSES["ISA"] = true
---------------------------------------------------
@@ -2029,8 +2046,6 @@ if (BUSES["TI99X"]~=null) then
MAME_DIR .. "src/devices/bus/ti99x/datamux.h",
MAME_DIR .. "src/devices/bus/ti99x/genboard.cpp",
MAME_DIR .. "src/devices/bus/ti99x/genboard.h",
- MAME_DIR .. "src/devices/bus/ti99x/grom.cpp",
- MAME_DIR .. "src/devices/bus/ti99x/grom.h",
MAME_DIR .. "src/devices/bus/ti99x/gromport.cpp",
MAME_DIR .. "src/devices/bus/ti99x/gromport.h",
MAME_DIR .. "src/devices/bus/ti99x/handset.cpp",
@@ -2454,6 +2469,8 @@ if (BUSES["VTECH_MEMEXP"]~=null) then
MAME_DIR .. "src/devices/bus/vtech/memexp/memory.h",
MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.cpp",
MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.h",
+ MAME_DIR .. "src/devices/bus/vtech/memexp/rtty.cpp",
+ MAME_DIR .. "src/devices/bus/vtech/memexp/rtty.h",
MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.cpp",
MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.h",
}
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 113d3962110..143cf78b4d0 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -1716,6 +1716,12 @@ if (CPUS["SM510"]~=null) then
MAME_DIR .. "src/devices/cpu/sm510/sm510op.cpp",
MAME_DIR .. "src/devices/cpu/sm510/sm510core.cpp",
MAME_DIR .. "src/devices/cpu/sm510/sm511core.cpp",
+ MAME_DIR .. "src/devices/cpu/sm510/sm500.h",
+ MAME_DIR .. "src/devices/cpu/sm510/sm500op.cpp",
+ MAME_DIR .. "src/devices/cpu/sm510/sm500core.cpp",
+ MAME_DIR .. "src/devices/cpu/sm510/kb1013vk1-2.h",
+ MAME_DIR .. "src/devices/cpu/sm510/kb1013vk1-2op.cpp",
+ MAME_DIR .. "src/devices/cpu/sm510/kb1013vk1-2core.cpp",
}
end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index efe30edbb1d..61563970d1b 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -34,6 +34,7 @@ includedirs {
includedirs {
ext_includedir("expat"),
ext_includedir("lua"),
+ ext_includedir("zlib"),
ext_includedir("flac"),
}
@@ -130,6 +131,8 @@ files {
MAME_DIR .. "src/emu/emualloc.h",
MAME_DIR .. "src/emu/emucore.cpp",
MAME_DIR .. "src/emu/emucore.h",
+ MAME_DIR .. "src/emu/emumem.cpp",
+ MAME_DIR .. "src/emu/emumem.h",
MAME_DIR .. "src/emu/emuopts.cpp",
MAME_DIR .. "src/emu/emuopts.h",
MAME_DIR .. "src/emu/emupal.cpp",
@@ -155,13 +158,10 @@ files {
MAME_DIR .. "src/emu/mame.h",
MAME_DIR .. "src/emu/machine.cpp",
MAME_DIR .. "src/emu/machine.h",
- MAME_DIR .. "src/emu/machine.ipp",
MAME_DIR .. "src/emu/mconfig.cpp",
MAME_DIR .. "src/emu/mconfig.h",
MAME_DIR .. "src/emu/memarray.cpp",
MAME_DIR .. "src/emu/memarray.h",
- MAME_DIR .. "src/emu/memory.cpp",
- MAME_DIR .. "src/emu/memory.h",
MAME_DIR .. "src/emu/network.cpp",
MAME_DIR .. "src/emu/network.h",
MAME_DIR .. "src/emu/parameters.cpp",
@@ -205,6 +205,8 @@ files {
MAME_DIR .. "src/emu/ui/devctrl.h",
MAME_DIR .. "src/emu/ui/menu.cpp",
MAME_DIR .. "src/emu/ui/menu.h",
+ MAME_DIR .. "src/emu/ui/submenu.cpp",
+ MAME_DIR .. "src/emu/ui/submenu.h",
MAME_DIR .. "src/emu/ui/mainmenu.cpp",
MAME_DIR .. "src/emu/ui/mainmenu.h",
MAME_DIR .. "src/emu/ui/miscmenu.cpp",
@@ -213,6 +215,8 @@ files {
MAME_DIR .. "src/emu/ui/barcode.h",
MAME_DIR .. "src/emu/ui/cheatopt.cpp",
MAME_DIR .. "src/emu/ui/cheatopt.h",
+ MAME_DIR .. "src/emu/ui/pluginopt.cpp",
+ MAME_DIR .. "src/emu/ui/pluginopt.h",
MAME_DIR .. "src/emu/ui/devopt.cpp",
MAME_DIR .. "src/emu/ui/devopt.h",
MAME_DIR .. "src/emu/ui/filemngr.cpp",
@@ -243,8 +247,6 @@ files {
MAME_DIR .. "src/emu/ui/auditmenu.h",
MAME_DIR .. "src/emu/ui/cmddata.h",
MAME_DIR .. "src/emu/ui/cmdrender.h",
- MAME_DIR .. "src/emu/ui/ctrlmenu.cpp",
- MAME_DIR .. "src/emu/ui/ctrlmenu.h",
MAME_DIR .. "src/emu/ui/custmenu.cpp",
MAME_DIR .. "src/emu/ui/custmenu.h",
MAME_DIR .. "src/emu/ui/custui.cpp",
@@ -256,8 +258,6 @@ files {
MAME_DIR .. "src/emu/ui/defimg.h",
MAME_DIR .. "src/emu/ui/dirmenu.cpp",
MAME_DIR .. "src/emu/ui/dirmenu.h",
- MAME_DIR .. "src/emu/ui/dsplmenu.cpp",
- MAME_DIR .. "src/emu/ui/dsplmenu.h",
MAME_DIR .. "src/emu/ui/icorender.h",
MAME_DIR .. "src/emu/ui/inifile.cpp",
MAME_DIR .. "src/emu/ui/inifile.h",
@@ -405,6 +405,7 @@ dependency {
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/vertical.lh" },
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd.lh" },
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd_rot.lh" },
+ { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/svg.lh" },
{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/noscreens.lh" },
{ MAME_DIR .. "src/emu/video.cpp", GEN_DIR .. "emu/layout/snap.lh" },
@@ -427,6 +428,7 @@ custombuildtask {
layoutbuildtask("emu/layout", "vertical"),
layoutbuildtask("emu/layout", "lcd"),
layoutbuildtask("emu/layout", "lcd_rot"),
+ layoutbuildtask("emu/layout", "svg"),
layoutbuildtask("emu/layout", "noscreens"),
layoutbuildtask("emu/layout", "snap"),
}
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index c43bbecb291..3c84b7a9ac9 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -64,6 +64,7 @@ project "utils"
MAME_DIR .. "src/lib/util/jedparse.h",
MAME_DIR .. "src/lib/util/md5.cpp",
MAME_DIR .. "src/lib/util/md5.h",
+ MAME_DIR .. "src/lib/util/nanosvg.cpp",
MAME_DIR .. "src/lib/util/opresolv.cpp",
MAME_DIR .. "src/lib/util/opresolv.h",
MAME_DIR .. "src/lib/util/options.cpp",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 93c0dd12140..7d97eae1c1c 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -125,7 +125,7 @@ end
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', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_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) .. "src/osd/sdl/emscripten_post.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"
@@ -255,10 +255,7 @@ end
local rctarget = _subtarget
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
- local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. rctarget ..".rc"
- if not os.isfile(rcfile) then
- rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
- end
+ rcfile = MAME_DIR .. "scripts/resources/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
if os.isfile(rcfile) then
files {
rcfile,
@@ -269,7 +266,7 @@ end
else
rctarget = "mame"
files {
- MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
+ MAME_DIR .. "scripts/resources/windows/mame/mame.rc",
}
dependency {
{ "$(OBJDIR)/mame.res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true },
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index f1bfab95b08..91eaa395ba1 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -74,6 +74,7 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/input/input_common.cpp",
MAME_DIR .. "src/osd/modules/input/input_common.h",
MAME_DIR .. "src/osd/modules/input/input_dinput.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_dinput.h",
MAME_DIR .. "src/osd/modules/input/input_none.cpp",
MAME_DIR .. "src/osd/modules/input/input_rawinput.cpp",
MAME_DIR .. "src/osd/modules/input/input_win32.cpp",
@@ -84,6 +85,27 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
MAME_DIR .. "src/osd/modules/input/input_windows.h",
MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_xinput.h",
+ MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp",
+ MAME_DIR .. "src/osd/modules/output/output_module.h",
+ MAME_DIR .. "src/osd/modules/output/none.cpp",
+ MAME_DIR .. "src/osd/modules/output/console.cpp",
+ MAME_DIR .. "src/osd/modules/output/network.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/tcp_server.h",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.h",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.h",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.h",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.cpp",
+ MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.h",
+ }
+ includedirs {
+ ext_includedir("uv"),
}
if _OPTIONS["targetos"]=="windows" then
@@ -126,10 +148,13 @@ function osdmodulesbuild()
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
+ "IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
}
files {
MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfxutil.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfxutil.h",
MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp",
@@ -169,7 +194,9 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
}
includedirs {
+ MAME_DIR .. "3rdparty/bgfx/examples/common",
MAME_DIR .. "3rdparty/bgfx/include",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty",
MAME_DIR .. "3rdparty/bx/include",
MAME_DIR .. "3rdparty/rapidjson/include",
}
@@ -393,6 +420,7 @@ function osdmodulestargetconf()
"gdi32",
"dsound",
"dxguid",
+ "oleaut32",
}
elseif _OPTIONS["targetos"]=="macosx" then
links {
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index 4869ec8716d..efdb28bd9c0 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -93,6 +93,10 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
MAME_DIR .. "src/osd/modules/input/input_windows.h",
MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
+ MAME_DIR .. "src/osd/modules/output/output_module.h",
+ MAME_DIR .. "src/osd/modules/output/none.cpp",
+ MAME_DIR .. "src/osd/modules/output/console.cpp",
+ MAME_DIR .. "src/osd/modules/output/network.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index f1d307b8cab..c42d9ab23ad 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -368,7 +368,7 @@ project ("osd_" .. _OPTIONS["osd"])
if _OPTIONS["targetos"]=="windows" then
files {
- MAME_DIR .. "src/osd/sdl/main.cpp",
+ MAME_DIR .. "src/osd/windows/main.cpp",
}
end
@@ -425,7 +425,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/window.h",
MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
- MAME_DIR .. "src/osd/sdl/output.cpp",
MAME_DIR .. "src/osd/sdl/watchdog.cpp",
MAME_DIR .. "src/osd/sdl/watchdog.h",
MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
@@ -461,7 +460,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/sdl/sdldir.cpp",
- MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
@@ -495,123 +493,4 @@ project ("ocore_" .. _OPTIONS["osd"])
}
end
- if _OPTIONS["targetos"]=="macosx" then
- files {
- MAME_DIR .. "src/osd/sdl/osxutils.h",
- MAME_DIR .. "src/osd/sdl/osxutils.mm",
- }
- end
-
-
---------------------------------------------------
--- testkeys
---------------------------------------------------
-
-if _OPTIONS["with-tools"] then
- project("testkeys")
- uuid ("744cec21-c3b6-4d69-93cb-6811fed0ffe3")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- dofile("sdl_cfg.lua")
-
- includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib/util",
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- links {
- "utils",
- "ocore_" .. _OPTIONS["osd"],
- }
-
- files {
- MAME_DIR .. "src/osd/sdl/testkeys.cpp",
- }
-
- if _OPTIONS["targetos"] == "windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2.dll",
- }
- configuration { "vs*" }
- links {
- "SDL2",
- "Imm32",
- "Version",
- }
- configuration { }
- else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
- links {
- "psapi",
- }
- linkoptions{
- "-municode",
- }
- files {
- MAME_DIR .. "src/osd/sdl/main.cpp",
- }
- end
-
- configuration { "mingw*" or "vs*" }
- targetextension ".exe"
-
- configuration { }
-
- strip()
-end
-
-
---------------------------------------------------
--- aueffectutil
---------------------------------------------------
-
-if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
- project("aueffectutil")
- uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e")
- kind "ConsoleApp"
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- dofile("sdl_cfg.lua")
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- linkoptions {
- "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist",
- }
-
- dependency {
- { "aueffectutil", MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", true },
- }
-
- links {
- "AudioUnit.framework",
- "AudioToolbox.framework",
- "CoreAudio.framework",
- "CoreAudioKit.framework",
- "CoreServices.framework",
- }
-
- files {
- MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
- }
-
- strip()
-end
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index f9a886dc176..e4be22d6e55 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -165,8 +165,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/render/drawgdi.h",
MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
MAME_DIR .. "src/osd/modules/render/drawnone.h",
- MAME_DIR .. "src/osd/windows/output.cpp",
- MAME_DIR .. "src/osd/windows/output.h",
MAME_DIR .. "src/osd/windows/video.cpp",
MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
@@ -253,7 +251,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
MAME_DIR .. "src/osd/windows/winutil.h",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/file/winfile.cpp",
@@ -263,34 +260,3 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
}
-
-
---------------------------------------------------
--- ledutil
---------------------------------------------------
-
-if _OPTIONS["with-tools"] then
- project("ledutil")
- uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
- kind "ConsoleApp"
-
- flags {
- "Symbols", -- always include minimum symbols for executables
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
- end
-
- links {
- "ocore_" .. _OPTIONS["osd"],
- }
-
- includedirs {
- MAME_DIR .. "src/osd",
- }
-
- files {
- MAME_DIR .. "src/osd/windows/ledutil.cpp",
- }
-end
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index 428974c23df..03859da4e0a 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -1285,6 +1285,16 @@ if (SOUNDS["YMZ770"]~=null) then
files {
MAME_DIR .. "src/devices/sound/ymz770.cpp",
MAME_DIR .. "src/devices/sound/ymz770.h",
+ }
+end
+
+---------------------------------------------------
+-- MPEG AUDIO
+--@src/devices/sound/mpeg_audio.h,SOUNDS["MPEG_AUDIO"] = true
+---------------------------------------------------
+
+if (SOUNDS["MPEG_AUDIO"]~=null) then
+ files {
MAME_DIR .. "src/devices/sound/mpeg_audio.cpp",
MAME_DIR .. "src/devices/sound/mpeg_audio.h",
}
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 913358f1d20..a2e5ad73496 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -741,3 +741,45 @@ configuration { "mingw*" or "vs*" }
configuration { }
strip()
+
+--------------------------------------------------
+-- aueffectutil
+--------------------------------------------------
+
+if _OPTIONS["targetos"] == "macosx" then
+ project("aueffectutil")
+ uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e")
+ kind "ConsoleApp"
+
+ flags {
+ "Symbols", -- always include minimum symbols for executables
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+
+ linkoptions {
+ "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/tools/aueffectutil-Info.plist",
+ }
+
+ dependency {
+ { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true },
+ }
+
+ links {
+ "AudioUnit.framework",
+ "AudioToolbox.framework",
+ "CoreAudio.framework",
+ "CoreAudioKit.framework",
+ "CoreServices.framework",
+ }
+
+ files {
+ MAME_DIR .. "src/tools/aueffectutil.mm",
+ }
+
+ configuration { }
+
+ strip()
+end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index f5df5c70280..b56343e389b 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -249,6 +249,7 @@ SOUNDS["TMS5110A"] = true
SOUNDS["LMC1992"] = true
SOUNDS["AWACS"] = true
SOUNDS["YMZ770"] = true
+SOUNDS["MPEG_AUDIO"] = true
SOUNDS["T6721A"] = true
SOUNDS["MOS7360"] = true
--SOUNDS["ESQPUMP"] = true
@@ -600,6 +601,7 @@ BUSES["CENTRONICS"] = true
--BUSES["EP64"] = true
--BUSES["EPSON_SIO"] = true
--BUSES["GAMEBOY"] = true
+BUSES["GAMEGEAR"] = true
--BUSES["GBA"] = true
BUSES["GENERIC"] = true
--BUSES["IEEE488"] = true
@@ -631,7 +633,7 @@ BUSES["RS232"] = true
--BUSES["SATURN"] = true
BUSES["SCSI"] = true
--BUSES["SCV"] = true
---BUSES["SEGA8"] = true
+BUSES["SEGA8"] = true
BUSES["SMS_CTRL"] = true
BUSES["SMS_EXP"] = true
--BUSES["SNES"] = true
@@ -801,10 +803,8 @@ files {
MAME_DIR .. "src/mame/machine/nmk112.h",
MAME_DIR .. "src/mame/machine/pcshare.cpp",
MAME_DIR .. "src/mame/machine/pcshare.h",
- MAME_DIR .. "src/mame/machine/segacrpt.cpp",
- MAME_DIR .. "src/mame/machine/segacrpt.h",
- MAME_DIR .. "src/mame/machine/segacrp2.cpp",
- MAME_DIR .. "src/mame/machine/segacrp2.h",
+ MAME_DIR .. "src/mame/machine/segacrpt_device.cpp",
+ MAME_DIR .. "src/mame/machine/segacrpt_device.h",
MAME_DIR .. "src/mame/machine/ticket.cpp",
MAME_DIR .. "src/mame/machine/ticket.h",
MAME_DIR .. "src/mame/video/avgdvg.cpp",
@@ -3044,6 +3044,8 @@ files {
MAME_DIR .. "src/mame/machine/naomim2.h",
MAME_DIR .. "src/mame/machine/naomim4.cpp",
MAME_DIR .. "src/mame/machine/naomim4.h",
+ MAME_DIR .. "src/mame/machine/m3comm.cpp",
+ MAME_DIR .. "src/mame/machine/m3comm.h",
MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp",
MAME_DIR .. "src/mame/machine/315-5881_crypt.h",
MAME_DIR .. "src/mame/machine/awboard.cpp",
@@ -3125,6 +3127,8 @@ files {
MAME_DIR .. "src/mame/video/suprloco.cpp",
MAME_DIR .. "src/mame/drivers/system1.cpp",
MAME_DIR .. "src/mame/includes/system1.h",
+ MAME_DIR .. "src/mame/machine/segacrp2_device.cpp",
+ MAME_DIR .. "src/mame/machine/segacrp2_device.h",
MAME_DIR .. "src/mame/video/system1.cpp",
MAME_DIR .. "src/mame/drivers/system16.cpp",
MAME_DIR .. "src/mame/includes/system16.h",
@@ -4354,6 +4358,7 @@ files {
MAME_DIR .. "src/mame/drivers/jongkyo.cpp",
MAME_DIR .. "src/mame/drivers/joystand.cpp",
MAME_DIR .. "src/mame/drivers/jubilee.cpp",
+ MAME_DIR .. "src/mame/drivers/jungleyo.cpp",
MAME_DIR .. "src/mame/drivers/kas89.cpp",
MAME_DIR .. "src/mame/drivers/kingpin.cpp",
MAME_DIR .. "src/mame/drivers/koikoi.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index cc5721040d7..854493641a6 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -251,6 +251,7 @@ SOUNDS["TMS5110A"] = true
SOUNDS["LMC1992"] = true
SOUNDS["AWACS"] = true
--SOUNDS["YMZ770"] = true
+--SOUNDS["MPEG_AUDIO"] = true
SOUNDS["T6721A"] = true
SOUNDS["MOS7360"] = true
SOUNDS["ESQPUMP"] = true
@@ -617,6 +618,7 @@ BUSES["GENERIC"] = true
BUSES["IEEE488"] = true
BUSES["IMI7000"] = true
BUSES["INTV"] = true
+BUSES["INTV_CTRL"] = true
BUSES["IQ151"] = true
BUSES["ISA"] = true
BUSES["ISBX"] = true
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index bf0fd462beb..3409ce3eb44 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -17,7 +17,9 @@
--------------------------------------------------
CPUS["Z80"] = true
---CPUS["M6502"] = true
+CPUS["M6800"] = true
+CPUS["M6803"] = true
+CPUS["M6809"] = true
--CPUS["MCS48"] = true
--CPUS["MCS51"] = true
--CPUS["M6800"] = true
@@ -33,9 +35,9 @@ CPUS["Z80"] = true
--SOUNDS["SAMPLES"] = true
SOUNDS["DAC"] = true
---SOUNDS["DISCRETE"] = true
+SOUNDS["DISCRETE"] = true
SOUNDS["AY8910"] = true
---SOUNDS["YM2151"] = true
+SOUNDS["MSM5205"] = true
--SOUNDS["ASTROCADE"] = true
--SOUNDS["TMS5220"] = true
--SOUNDS["OKIM6295"] = true
@@ -84,6 +86,8 @@ function createProjects_mame_nl(_target, _subtarget)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-mame-nl"))
+ addprojectflags()
+ precompiledheaders()
includedirs {
MAME_DIR .. "src/osd",
@@ -109,6 +113,12 @@ files{
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/irem.h",
}
end