summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/src
diff options
context:
space:
mode:
author Robbbert <pac0446@bigpond.net.au>2016-04-27 18:59:40 +1000
committer Robbbert <pac0446@bigpond.net.au>2016-04-27 18:59:40 +1000
commitbcd8558b02cb54eab92df98f14bf07221d6d358b (patch)
treec29211cecf250a791c074dfc3e1fc9a2d9a1a593 /docs/release/scripts/src
parent0d70c1f8cdb9e66fd7bc5bcad128e394a2345607 (diff)
0.173 Release Fileshbmame173
Diffstat (limited to 'docs/release/scripts/src')
-rw-r--r--docs/release/scripts/src/3rdparty.lua816
-rw-r--r--docs/release/scripts/src/benchmarks.lua6
-rw-r--r--docs/release/scripts/src/bus.lua149
-rw-r--r--docs/release/scripts/src/cpu.lua71
-rw-r--r--docs/release/scripts/src/devices.lua62
-rw-r--r--docs/release/scripts/src/emu.lua212
-rw-r--r--docs/release/scripts/src/lib.lua571
-rw-r--r--docs/release/scripts/src/machine.lua87
-rw-r--r--docs/release/scripts/src/main.lua251
-rw-r--r--docs/release/scripts/src/mame/frontend.lua154
-rw-r--r--docs/release/scripts/src/netlist.lua18
-rw-r--r--docs/release/scripts/src/osd/modules.lua148
-rw-r--r--docs/release/scripts/src/osd/newui.lua76
-rw-r--r--docs/release/scripts/src/osd/sdl.lua305
-rw-r--r--docs/release/scripts/src/osd/sdl_cfg.lua46
-rw-r--r--docs/release/scripts/src/osd/windows.lua65
-rw-r--r--docs/release/scripts/src/osd/windows_cfg.lua2
-rw-r--r--docs/release/scripts/src/osd/winui.lua116
-rw-r--r--docs/release/scripts/src/sound.lua109
-rw-r--r--docs/release/scripts/src/tests.lua23
-rw-r--r--docs/release/scripts/src/tools.lua496
-rw-r--r--docs/release/scripts/src/video.lua12
22 files changed, 2245 insertions, 1550 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua
index 2cbb33e393e..26d5c687cd0 100644
--- a/docs/release/scripts/src/3rdparty.lua
+++ b/docs/release/scripts/src/3rdparty.lua
@@ -13,11 +13,39 @@
-- expat library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-expat"] then
+if not _OPTIONS["with-system-expat"] then
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
@@ -26,10 +54,10 @@ project "expat"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
configuration { "vs2015" }
@@ -45,7 +73,7 @@ end
}
else
links {
- "expat",
+ ext_lib("expat"),
}
end
@@ -53,13 +81,13 @@ end
-- zlib library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-zlib"] then
+if not _OPTIONS["with-system-zlib"] then
project "zlib"
uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9"
kind "StaticLib"
local version = str_to_version(_OPTIONS["gcc_version"])
- if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then
+ if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then
configuration { "gmake" }
if (version >= 30700) then
buildoptions {
@@ -76,8 +104,8 @@ project "zlib"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd280", -- remark #280: selector expression is constant
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd280", -- remark #280: selector expression is constant
}
end
configuration "Debug"
@@ -110,7 +138,7 @@ end
}
else
links {
- "z",
+ ext_lib("zlib"),
}
end
@@ -137,7 +165,7 @@ project "softfloat"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
configuration { }
@@ -152,7 +180,7 @@ end
-- libJPEG library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-jpeg"] then
+if not _OPTIONS["with-system-jpeg"] then
project "jpeg"
uuid "447c6800-dcfd-4c48-b72a-a8223bb409ca"
kind "StaticLib"
@@ -165,7 +193,7 @@ project "jpeg"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
@@ -221,7 +249,7 @@ end
}
else
links {
- "jpeg",
+ ext_lib("jpeg"),
}
end
@@ -229,7 +257,7 @@ end
-- libflac library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-flac"] then
+if not _OPTIONS["with-system-flac"] then
project "flac"
uuid "b6fc19e8-073a-4541-bb7b-d24b548d424a"
kind "StaticLib"
@@ -243,11 +271,11 @@ project "flac"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd111", -- remark #111: statement is unreachable
- "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
- "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
- "/Qwd188", -- error #188: enumerated type mixed with another type
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd111", -- remark #111: statement is unreachable
+ "/Qwd177", -- remark #177: function "xxx" was declared but never referenced
+ "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
+ "/Qwd188", -- error #188: enumerated type mixed with another type
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
@@ -271,12 +299,12 @@ end
"HAVE_CONFIG_H=1",
}
- configuration { "gmake"}
+ configuration { "gmake" }
buildoptions_c {
"-Wno-unused-function",
"-O0",
}
- if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android")) then
buildoptions {
"-Wno-enum-conversion",
}
@@ -312,7 +340,7 @@ end
}
else
links {
- "FLAC",
+ ext_lib("flac"),
}
end
@@ -324,13 +352,24 @@ 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
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
}
end
configuration { "vs2015" }
@@ -346,31 +385,54 @@ 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",
}
--------------------------------------------------
-- LUA library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-lua"] then
+if not _OPTIONS["with-system-lua"] then
project "lua"
uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9"
kind "StaticLib"
@@ -381,7 +443,7 @@ project "lua"
-- In addition comment out the "extern "C""
-- in lua.hpp and do the same in luaengine.c line 47
--options {
- -- "ForceCPP",
+ -- "ForceCPP",
--}
configuration { "gmake" }
@@ -406,7 +468,7 @@ end
"LUA_COMPAT_5_1",
"LUA_COMPAT_5_2",
}
- if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
+ if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="pnacl") then
defines {
"LUA_USE_POSIX",
}
@@ -460,7 +522,7 @@ end
}
else
links {
- "lua",
+ ext_lib("lua"),
}
end
@@ -480,6 +542,11 @@ project "lualibs"
"/wd4130", -- warning C4130: '==': logical operation on address of string constant
}
+ configuration { "pnacl"}
+ buildoptions {
+ "-Wno-char-subscripts",
+ }
+
configuration { }
defines {
"LUA_COMPAT_ALL",
@@ -488,16 +555,11 @@ project "lualibs"
includedirs {
MAME_DIR .. "3rdparty",
}
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
- end
- if _OPTIONS["with-bundled-zlib"] then
- includedirs {
- MAME_DIR .. "3rdparty/zlib",
- }
- end
+ includedirs {
+ ext_includedir("lua"),
+ ext_includedir("zlib"),
+ ext_includedir("sqlite3"),
+ }
files {
MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
@@ -506,64 +568,11 @@ project "lualibs"
}
--------------------------------------------------
--- luv lua library objects
---------------------------------------------------
-
-project "luv"
- uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871"
- kind "StaticLib"
-
- if _OPTIONS["targetos"]=="windows" then
- defines {
- "_WIN32_WINNT=0x0600",
- }
- end
- configuration { "vs*" }
- buildoptions {
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- }
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-unused-function",
- "-Wno-strict-prototypes",
- "-Wno-unused-variable",
- "-Wno-maybe-uninitialized",
- "-Wno-undef",
- }
-
- configuration { "vs2015" }
- buildoptions {
- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used
- }
-
- configuration { }
- defines {
- "LUA_COMPAT_ALL",
- }
-
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- MAME_DIR .. "3rdparty/libuv/include",
- }
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/luv/deps/lua/src",
- }
- end
-
- files {
- MAME_DIR .. "3rdparty/luv/src/luv.c",
- MAME_DIR .. "3rdparty/luv/src/luv.h",
- }
-
---------------------------------------------------
-- SQLite3 library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-sqlite3"] then
-project "sqllite3"
+if not _OPTIONS["with-system-sqlite3"] then
+project "sqlite3"
uuid "5cb3d495-57ed-461c-81e5-80dc0857517d"
kind "StaticLib"
@@ -577,11 +586,14 @@ project "sqllite3"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
-
+ configuration { "pnacl" }
+ defines {
+ "SQLITE_OMIT_LOAD_EXTENSION",
+ }
configuration { "vs2015" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -610,7 +622,7 @@ end
}
else
links {
- "sqlite3",
+ ext_lib("sqlite3"),
}
end
@@ -618,7 +630,7 @@ end
-- portmidi library objects
--------------------------------------------------
if _OPTIONS["NO_USE_MIDI"]~="1" then
-if _OPTIONS["with-bundled-portmidi"] then
+if not _OPTIONS["with-system-portmidi"] then
project "portmidi"
uuid "587f2da6-3274-4a65-86a2-f13ea315bb98"
kind "StaticLib"
@@ -637,10 +649,10 @@ project "portmidi"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd188", -- error #188: enumerated type mixed with another type
- "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
+ "/Qwd188", -- error #188: enumerated type mixed with another type
+ "/Qwd344", -- remark #344: typedef name has already been declared (with same type)
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
@@ -697,7 +709,7 @@ end
end
else
links {
- "portmidi",
+ ext_lib("portmidi"),
}
end
end
@@ -718,9 +730,9 @@ project "bgfx"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
- "/Qwd82", -- remark #82: storage class is not first
+ "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx"
+ "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+ "/Qwd82", -- remark #82: storage class is not first
}
end
configuration { }
@@ -737,6 +749,11 @@ end
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
}
+ configuration { "android-*"}
+ buildoptions {
+ "-Wno-macro-redefined",
+ }
+
configuration { "vs*" }
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/msvc",
@@ -765,6 +782,15 @@ end
buildoptions {
"-Wno-uninitialized",
"-Wno-unused-function",
+ "-Wno-unused-but-set-variable",
+ }
+ configuration { "rpi" }
+ buildoptions {
+ "-Wno-unused-but-set-variable",
+ "-Wno-unused-variable",
+ }
+ defines {
+ "__STDC_VERSION__=199901L",
}
configuration { }
@@ -793,6 +819,7 @@ end
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",
"__STDC_CONSTANT_MACROS",
+ "BGFX_CONFIG_MAX_FRAME_BUFFERS=128",
}
files {
MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp",
@@ -801,17 +828,20 @@ 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",
MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp",
+ MAME_DIR .. "3rdparty/bgfx/src/topology.cpp",
MAME_DIR .. "3rdparty/bgfx/src/vertexdecl.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/bgfx_utils.cpp",
MAME_DIR .. "3rdparty/bgfx/examples/common/bounds.cpp",
@@ -822,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 {
@@ -837,7 +876,7 @@ end
-- PortAudio library objects
--------------------------------------------------
-if _OPTIONS["with-bundled-portaudio"] then
+if not _OPTIONS["with-system-portaudio"] then
project "portaudio"
uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4"
kind "StaticLib"
@@ -853,10 +892,10 @@ project "portaudio"
}
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd869", -- remark #869: parameter "xxx" was never referenced
- "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
- "/Qwd2544", -- message #2544: empty dependent statement in if-statement
- "/Qwd1879", -- warning #1879: unimplemented pragma ignored
+ "/Qwd869", -- remark #869: parameter "xxx" was never referenced
+ "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
+ "/Qwd2544", -- message #2544: empty dependent statement in if-statement
+ "/Qwd1879", -- warning #1879: unimplemented pragma ignored
}
end
configuration { "vs2015" }
@@ -878,7 +917,7 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
buildoptions_c {
"-Wno-unknown-warning-option",
"-Wno-absolute-value",
@@ -982,13 +1021,15 @@ end
else
links {
- "portaudio",
+ ext_lib("portaudio"),
}
end
--------------------------------------------------
-- libuv library objects
--------------------------------------------------
+if _OPTIONS["USE_LIBUV"]=="1" then
+if not _OPTIONS["with-system-uv"] then
project "uv"
uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0"
kind "StaticLib"
@@ -1012,7 +1053,7 @@ project "uv"
local version = str_to_version(_OPTIONS["gcc_version"])
if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
buildoptions_c {
"-Wno-unknown-warning-option",
"-Wno-unknown-attributes",
@@ -1053,7 +1094,7 @@ project "uv"
"WIN32_LEAN_AND_MEAN",
"_WIN32_WINNT=0x0502",
}
- if _ACTION == "vs2013" then
+ if _ACTION == "vs2013" then
files {
MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c",
}
@@ -1138,6 +1179,25 @@ project "uv"
MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
}
end
+
+ if _OPTIONS["targetos"]=="android" then
+ defines {
+ "_GNU_SOURCE",
+ }
+ buildoptions {
+ "-Wno-header-guard",
+ }
+ files {
+ MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h",
+ MAME_DIR .. "3rdparty/libuv/src/unix/pthread-fixes.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c",
+ }
+ end
+
if _OPTIONS["targetos"]=="solaris" then
defines {
"__EXTENSIONS__",
@@ -1159,7 +1219,7 @@ project "uv"
"-Wshadow"
}
end
-
+end
--------------------------------------------------
-- HTTP parser library objects
--------------------------------------------------
@@ -1178,3 +1238,505 @@ project "http-parser"
"-Wshadow"
}
end
+
+else
+links {
+ ext_lib("uv"),
+}
+end
+--------------------------------------------------
+-- SDL2 library
+--------------------------------------------------
+if _OPTIONS["with-bundled-sdl2"] then
+project "SDL2"
+ uuid "caab3327-574f-4abf-b25b-74d5238ae59b"
+if _OPTIONS["targetos"]=="android" then
+ kind "SharedLib"
+ targetextension ".so"
+ targetprefix "lib"
+ links {
+ "GLESv1_CM",
+ "GLESv2",
+ "log",
+ }
+ linkoptions {
+ "-Wl,-soname,libSDL2.so"
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["PLATFORM"]=="arm" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
+ end
+ if _OPTIONS["PLATFORM"]=="arm64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a")
+ end
+ if _OPTIONS["PLATFORM"]=="mips" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips")
+ end
+ if _OPTIONS["PLATFORM"]=="mips64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64")
+ end
+ if _OPTIONS["PLATFORM"]=="x86" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86")
+ end
+ if _OPTIONS["PLATFORM"]=="x64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
+ end
+ end
+else
+ kind "StaticLib"
+end
+
+ files {
+ MAME_DIR .. "3rdparty/SDL2/include/begin_code.h",
+ MAME_DIR .. "3rdparty/SDL2/include/close_code.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_assert.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_atomic.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_audio.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_bits.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_blendmode.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_clipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_config.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_config_windows.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_copying.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_cpuinfo.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_egl.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_endian.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_error.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_events.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_filesystem.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_gamecontroller.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_gesture.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_haptic.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_hints.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_joystick.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_keyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_keycode.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_loadso.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_log.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_main.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_messagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_mouse.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_mutex.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_name.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengl.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengl_glext.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2ext.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2platform.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_khrplatform.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_pixels.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_platform.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_power.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_quit.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_rect.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_render.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_revision.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_rwops.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_scancode.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_shape.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_stdinc.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_surface.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_system.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_syswm.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_assert.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_common.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_compare.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_crc32.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_font.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_fuzzer.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_harness.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_images.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_log.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_md5.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_random.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_thread.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_timer.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_touch.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_types.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_version.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_video.h",
+
+
+ MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_atomic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_spinlock.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/dummy/SDL_dummyaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/dummy/SDL_dummyaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audio_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiocvt.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiodev.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiodev_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiomem.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiotypecvt.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_mixer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_sysaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_wave.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_wave.h",
+ MAME_DIR .. "3rdparty/SDL2/src/cpuinfo/SDL_cpuinfo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.c",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.h",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi_overrides.h",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi_procs.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/blank_cursor.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/default_cursor.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_clipboardevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_clipboardevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_dropevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_dropevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_events.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_events_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_gesture.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_gesture_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_keyboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_keyboard_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_mouse.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_mouse_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_quit.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_sysevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_touch.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_touch_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_windowevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_windowevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/file/SDL_rwops.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_haptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_syshaptic.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_gamecontroller.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_joystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_joystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_sysjoystick.h",
+ MAME_DIR .. "3rdparty/SDL2/src/loadso/windows/SDL_sysloadso.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/SDL_power.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/windows/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/direct3d/SDL_render_d3d.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/direct3d11/SDL_render_d3d11.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/mmx.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_render_gl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_shaders_gl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_shaders_gl.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles2/SDL_render_gles2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles2/SDL_shaders_gles2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_d3dmath.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_d3dmath.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_render.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_sysrender.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_mmx.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_sw.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_sw_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendfillrect.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendfillrect.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendline.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendline.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendpoint.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendpoint.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_draw.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawline.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawline.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawpoint.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawpoint.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_render_sw.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_render_sw_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_rotate.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_rotate.h",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_assert.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_error.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_error_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_hints.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_hints_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_log.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_getenv.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_iconv.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_malloc.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_qsort.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_stdlib.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_string.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_systhread.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_systimer.h",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_timer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_timer_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullframebuffer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullframebuffer_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullvideo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_0.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_1.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_A.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_auto.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_auto.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_copy.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_copy.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_N.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_slow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_slow.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_bmp.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_clipboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_egl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_fillrect.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_glesfuncs.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_glfuncs.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_pixels.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_pixels_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_rect.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_rect_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_RLEaccel.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_RLEaccel_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_shape.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_shape_internals.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_stretch.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_surface.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_sysvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_video.c",
+
+ }
+ if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="windows" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_atan2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_log.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_pow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_rem_pio2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_sqrt.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_cos.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_rem_pio2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_sin.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_tan.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/math.h",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/math_private.h",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_atan.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_copysign.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_cos.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_fabs.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_floor.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_scalbn.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_sin.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_tan.c",
+ }
+ end
+ if _OPTIONS["targetos"]~="windows" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_render_gles.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_glesfuncs.h",
+ }
+ end
+
+ if _OPTIONS["targetos"]=="android" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h",
+ MAME_DIR .. "3rdparty/SDL2/src/filesystem/android/SDL_sysfilesystem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/dummy/SDL_syshaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/android/SDL_sysjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/android/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syssem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systls.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidgl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidkeyboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidkeyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.h",
+ }
+ end
+
+ if _OPTIONS["targetos"]=="macosx" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.m",
+ MAME_DIR .. "3rdparty/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.h",
+ MAME_DIR .. "3rdparty/SDL2/src/filesystem/cocoa/SDL_sysfilesystem.m",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/darwin/SDL_syshaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/darwin/SDL_syshaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syssem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systls.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaclipboard.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaclipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaevents.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoakeyboard.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoakeyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamessagebox.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamessagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamodes.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamodes.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamouse.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamouse.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamousetap.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamousetap.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaopengl.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaopengl.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoashape.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoashape.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoavideo.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoavideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoawindow.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoawindow.h",
+
+ }
+ end
+
+ if _OPTIONS["targetos"]=="windows" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/thread/generic/SDL_syscond.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_directx.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_windows.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_windows.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_xinput.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_xinput.h",
+ MAME_DIR .. "3rdparty/SDL2/src/filesystem/windows/SDL_sysfilesystem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_dinputhaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_dinputhaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_windowshaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_windowshaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_xinputhaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_xinputhaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_dinputjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_dinputjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_mmjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_windowsjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_windowsjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_xinputjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_xinputjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_sysmutex.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_syssem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systhread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systhread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systls.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/windows/SDL_systimer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_vkeys.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsclipboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsclipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsframebuffer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsframebuffer.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowskeyboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowskeyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmessagebox.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmessagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmodes.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmodes.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmouse.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmouse.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengl.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengles.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsshape.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsshape.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsvideo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowswindow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowswindow.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/wmmsg.h",
+ MAME_DIR .. "3rdparty/SDL2/src/main/windows/version.rc",
+ }
+ end
+
+ configuration { "vs*" }
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/xaudio2/SDL_xaudio2.c",
+ }
+
+ buildoptions {
+ "/wd4200", -- warning C4200: nonstandard extension used: zero-sized array in struct/union
+ "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx'
+ "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression
+ "/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx'
+ "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+ "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer
+ "/wd4054", -- warning C4054: 'type cast': from function pointer 'xxx' to data pointer 'xxx'
+ }
+ defines {
+ "HAVE_LIBC",
+ }
+
+ configuration { "mingw*"}
+ includedirs {
+ MAME_DIR .. "3rdparty/SDL2-override/mingw",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
+ }
+ buildoptions_c {
+ "-Wno-undef",
+ "-Wno-strict-prototypes",
+ "-Wno-bad-function-cast",
+ "-Wno-discarded-qualifiers",
+ "-Wno-unused-but-set-variable",
+ }
+
+ configuration { "osx*"}
+ buildoptions {
+ "-Wno-undef",
+ }
+ buildoptions_objc {
+ "-x objective-c",
+ "-std=c99",
+ }
+
+ buildoptions_c {
+ "-Wno-bad-function-cast",
+ }
+
+ configuration { "android-*"}
+ defines {
+ "GL_GLEXT_PROTOTYPES",
+ }
+ buildoptions_c {
+ "-Wno-bad-function-cast",
+ "-Wno-incompatible-pointer-types-discards-qualifiers",
+ "-Wno-unneeded-internal-declaration",
+ "-Wno-unused-const-variable",
+ }
+
+ configuration { }
+ includedirs {
+ MAME_DIR .. "3rdparty/SDL2/include",
+ }
+
+end
diff --git a/docs/release/scripts/src/benchmarks.lua b/docs/release/scripts/src/benchmarks.lua
index f774e3f45ca..a643939d6db 100644
--- a/docs/release/scripts/src/benchmarks.lua
+++ b/docs/release/scripts/src/benchmarks.lua
@@ -45,13 +45,13 @@ project "benchmark"
project("benchmarks")
uuid ("a9750a48-d283-4a6d-b126-31c7ce049af1")
- kind "ConsoleApp"
+ kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua
index 9514e9f5a74..c525ce46732 100644
--- a/docs/release/scripts/src/bus.lua
+++ b/docs/release/scripts/src/bus.lua
@@ -705,6 +705,23 @@ end
---------------------------------------------------
--
+--@src/devices/bus/intv_ctrl/ctrl.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
---------------------------------------------------
@@ -1445,6 +1462,8 @@ if (BUSES["A2BUS"]~=null) then
MAME_DIR .. "src/devices/bus/a2bus/ramcard128k.h",
MAME_DIR .. "src/devices/bus/a2bus/ezcgi.cpp",
MAME_DIR .. "src/devices/bus/a2bus/ezcgi.h",
+ MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.cpp",
+ MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.h",
}
end
@@ -1932,6 +1951,58 @@ end
---------------------------------------------------
--
+--@src/devices/bus/neogeo_ctrl/ctrl.h,BUSES["NEOGEO_CTRL"] = true
+---------------------------------------------------
+
+if (BUSES["NEOGEO_CTRL"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/ctrl.h",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/joystick.cpp",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/joystick.h",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/mahjong.cpp",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/mahjong.h",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/dial.cpp",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/dial.h",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/irrmaze.cpp",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/irrmaze.h",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/kizuna4p.cpp",
+ MAME_DIR .. "src/devices/bus/neogeo_ctrl/kizuna4p.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/sat_ctrl/ctrl.h,BUSES["SAT_CTRL"] = true
+---------------------------------------------------
+
+if (BUSES["SAT_CTRL"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/sat_ctrl/ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/ctrl.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/analog.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/analog.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/joy.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/joy.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/joy_md.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/joy_md.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/keybd.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/keybd.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/mouse.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/mouse.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/multitap.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/multitap.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/pointer.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/pointer.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/racing.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/racing.h",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/segatap.cpp",
+ MAME_DIR .. "src/devices/bus/sat_ctrl/segatap.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/bus/saturn/sat_slot.h,BUSES["SATURN"] = true
---------------------------------------------------
@@ -2027,8 +2098,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",
@@ -2038,8 +2107,6 @@ if (BUSES["TI99X"]~=null) then
MAME_DIR .. "src/devices/bus/ti99x/mecmouse.cpp",
MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h",
MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h",
- MAME_DIR .. "src/devices/bus/ti99x/videowrp.cpp",
- MAME_DIR .. "src/devices/bus/ti99x/videowrp.h",
}
end
@@ -2452,6 +2519,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",
}
@@ -2572,3 +2641,75 @@ if (BUSES["M5"]~=null) then
}
end
+---------------------------------------------------
+--
+--@src/devices/bus/newbrain/exp.h,BUSES["NEWBRAIN"] = true
+---------------------------------------------------
+
+if (BUSES["NEWBRAIN"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/newbrain/exp.cpp",
+ MAME_DIR .. "src/devices/bus/newbrain/exp.h",
+ MAME_DIR .. "src/devices/bus/newbrain/eim.cpp",
+ MAME_DIR .. "src/devices/bus/newbrain/eim.h",
+ MAME_DIR .. "src/devices/bus/newbrain/fdc.cpp",
+ MAME_DIR .. "src/devices/bus/newbrain/fdc.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/svi3x8/expander/expander.h,BUSES["SVI_EXPANDER"] = true
+---------------------------------------------------
+
+if (BUSES["SVI_EXPANDER"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/expander.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/expander.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/modules.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/modules.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/sv601.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/sv601.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/sv602.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/sv602.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/sv603.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/expander/sv603.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/svi3x8/slot/slot.h,BUSES["SVI_SLOT"] = true
+---------------------------------------------------
+
+if (BUSES["SVI_SLOT"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/slot.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/slot.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/cards.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/cards.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv801.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv801.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv802.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv802.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv803.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv803.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv805.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv805.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv806.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv806.h",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv807.cpp",
+ MAME_DIR .. "src/devices/bus/svi3x8/slot/sv807.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/hp_optroms/hp_optrom.h,BUSES["HP_OPTROM"] = true
+---------------------------------------------------
+
+if (BUSES["HP_OPTROM"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/bus/hp_optroms/hp_optrom.cpp",
+ }
+end
diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua
index ed6378f93f8..2590dea1c93 100644
--- a/docs/release/scripts/src/cpu.lua
+++ b/docs/release/scripts/src/cpu.lua
@@ -35,7 +35,7 @@ if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RS
MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
MAME_DIR .. "src/devices/cpu/drcbex64.h",
MAME_DIR .. "src/devices/cpu/drcumlsh.h",
- MAME_DIR .. "src/devices/cpu/x86emit.h",
+ MAME_DIR .. "src/devices/cpu/x86emit.h",
}
end
@@ -86,7 +86,7 @@ if (CPUS["ARCOMPACT"]~=null) then
MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h",
}
dependency {
- { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+ { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
}
@@ -577,7 +577,7 @@ if (CPUS["H8"]~=null) then
MAME_DIR .. "src/devices/cpu/h8/h8_sci.cpp",
MAME_DIR .. "src/devices/cpu/h8/h8_sci.h",
}
-
+
dependency {
{ MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.inc" },
{ MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.inc" },
@@ -950,7 +950,7 @@ end
if (CPUS["I960"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/i960/i960.cpp",
- MAME_DIR .. "src/devices/cpu/i960/i960.h",
+ MAME_DIR .. "src/devices/cpu/i960/i960.h",
}
end
@@ -1163,7 +1163,7 @@ if (CPUS["M37710"]~=null) then
MAME_DIR .. "src/devices/cpu/m37710/m37710cm.h",
MAME_DIR .. "src/devices/cpu/m37710/m37710il.h",
MAME_DIR .. "src/devices/cpu/m37710/m37710op.h",
- MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h",
+ MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h",
}
end
@@ -1233,7 +1233,7 @@ if (CPUS["M6502"]~=null) then
MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp",
MAME_DIR .. "src/devices/cpu/m6502/m5074x.h",
}
-
+
dependency {
{ MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.inc" },
{ MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.inc" },
@@ -1432,14 +1432,14 @@ end
--------------------------------------------------
if (CPUS["PATINHOFEIO"]~=null) then
- files {
- MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp",
- MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h",
- }
+ files {
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp",
+ MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h",
+ }
end
if (CPUS["PATINHOFEIO"]~=null or _OPTIONS["with-tools"]) then
- table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp")
end
--------------------------------------------------
@@ -1465,6 +1465,8 @@ end
--------------------------------------------------
-- NEC V-series Intel-compatible
--@src/devices/cpu/nec/nec.h,CPUS["NEC"] = true
+--@src/devices/cpu/nec/v25.h,CPUS["NEC"] = true
+--@src/devices/cpu/nec/v53.h,CPUS["NEC"] = true
--@src/devices/cpu/v30mz/v30mz.h,CPUS["V30MZ"] = true
--------------------------------------------------
@@ -1612,7 +1614,7 @@ if (CPUS["MINX"]~=null) then
MAME_DIR .. "src/devices/cpu/minx/minxfunc.h",
MAME_DIR .. "src/devices/cpu/minx/minxopce.h",
MAME_DIR .. "src/devices/cpu/minx/minxopcf.h",
- MAME_DIR .. "src/devices/cpu/minx/minxops.h",
+ MAME_DIR .. "src/devices/cpu/minx/minxops.h",
}
end
@@ -1696,7 +1698,7 @@ if (CPUS["SATURN"]~=null) then
MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp",
MAME_DIR .. "src/devices/cpu/saturn/saturn.h",
MAME_DIR .. "src/devices/cpu/saturn/satops.inc",
- MAME_DIR .. "src/devices/cpu/saturn/sattable.inc",
+ MAME_DIR .. "src/devices/cpu/saturn/sattable.inc",
}
end
@@ -1716,6 +1718,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
@@ -1842,19 +1850,39 @@ if (CPUS["AVR8"]~=null or _OPTIONS["with-tools"]) then
end
--------------------------------------------------
--- Texas Instruments TMS0980
---@src/devices/cpu/tms0980/tms0980.h,CPUS["TMS0980"] = true
+-- Texas Instruments TMS1000 series
+--@src/devices/cpu/tms1000/tms1000.h,CPUS["TMS1000"] = true
+--@src/devices/cpu/tms1000/tms1100.h,CPUS["TMS1000"] = true
+--@src/devices/cpu/tms1000/tms1400.h,CPUS["TMS1000"] = true
+--@src/devices/cpu/tms1000/tms0970.h,CPUS["TMS1000"] = true
+--@src/devices/cpu/tms1000/tms0980.h,CPUS["TMS1000"] = true
+--@src/devices/cpu/tms1000/tms0270.h,CPUS["TMS1000"] = true
+--@src/devices/cpu/tms1000/tp0320.h,CPUS["TMS1000"] = true
--------------------------------------------------
-if (CPUS["TMS0980"]~=null) then
+if (CPUS["TMS1000"]~=null) then
files {
- MAME_DIR .. "src/devices/cpu/tms0980/tms0980.cpp",
- MAME_DIR .. "src/devices/cpu/tms0980/tms0980.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1k_base.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1k_base.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1000.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1000.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1100.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1100.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1400.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms1400.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms0970.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms0970.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms0980.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms0980.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms0270.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tms0270.h",
+ MAME_DIR .. "src/devices/cpu/tms1000/tp0320.cpp",
+ MAME_DIR .. "src/devices/cpu/tms1000/tp0320.h",
}
end
-if (CPUS["TMS0980"]~=null or _OPTIONS["with-tools"]) then
- table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms0980/tms0980d.cpp")
+if (CPUS["TMS1000"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms1000/tms1k_dasm.cpp")
end
--------------------------------------------------
@@ -1879,7 +1907,6 @@ end
--@src/devices/cpu/tms9900/tms9900.h,CPUS["TMS9900"] = true
--@src/devices/cpu/tms9900/tms9980a.h,CPUS["TMS9900"] = true
--@src/devices/cpu/tms9900/tms9995.h,CPUS["TMS9900"] = true
-
--------------------------------------------------
if (CPUS["TMS9900"]~=null) then
@@ -2024,7 +2051,7 @@ if (CPUS["TMS57002"]~=null) then
{ MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
{ MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
}
- custombuildtask {
+ custombuildtask {
{ MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } }
}
end
diff --git a/docs/release/scripts/src/devices.lua b/docs/release/scripts/src/devices.lua
index 15e53a17cfb..1248bcc0fe5 100644
--- a/docs/release/scripts/src/devices.lua
+++ b/docs/release/scripts/src/devices.lua
@@ -37,17 +37,10 @@ function devicesProject(_target, _subtarget)
MAME_DIR .. "3rdparty",
GEN_DIR .. "emu",
GEN_DIR .. "emu/layout",
+ ext_includedir("expat"),
+ ext_includedir("lua"),
+ ext_includedir("flac"),
}
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
- end
dofile(path.join("src", "cpu.lua"))
@@ -57,44 +50,7 @@ function devicesProject(_target, _subtarget)
dofile(path.join("src", "machine.lua"))
-if (_OPTIONS["SOURCES"] == nil) then
- project ("bus")
- uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
- kind (LIBTYPE)
- targetsubdir(_target .."_" .. _subtarget)
- addprojectflags()
- precompiledheaders()
- options {
- "ArchiveSplit",
- }
-
- includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices",
- MAME_DIR .. "src/lib/netlist",
- MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "3rdparty",
- MAME_DIR .. "src/mame", -- used for nes bus devices,some mess bus devices need this
- GEN_DIR .. "emu",
- GEN_DIR .. "emu/layout",
- }
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
- end
-
dofile(path.join("src", "bus.lua"))
-else
- dofile(path.join("src", "bus.lua"))
-end
if #disasm_files > 0 then
project ("dasm")
@@ -112,17 +68,9 @@ if #disasm_files > 0 then
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
GEN_DIR .. "emu",
+ ext_includedir("expat"),
+ ext_includedir("lua"),
}
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
- end
files {
disasm_files
diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua
index c4bb8ece0cf..2fdefe75e3e 100644
--- a/docs/release/scripts/src/emu.lua
+++ b/docs/release/scripts/src/emu.lua
@@ -22,38 +22,23 @@ options {
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices", -- till deps are fixed
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
GEN_DIR .. "emu",
GEN_DIR .. "emu/layout",
}
-if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
-end
-if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
-end
-if (_OPTIONS["targetos"] == "windows") then
- defines {
- "UI_WINDOWS",
- }
-end
-
-if (_OPTIONS["osd"] == "sdl") then
- defines {
- "UI_SDL",
- }
-end
+includedirs {
+ ext_includedir("expat"),
+ ext_includedir("lua"),
+ ext_includedir("zlib"),
+ ext_includedir("flac"),
+}
files {
MAME_DIR .. "src/emu/emu.h",
+ MAME_DIR .. "src/emu/main.h",
MAME_DIR .. "src/emu/gamedrv.h",
MAME_DIR .. "src/emu/hashfile.cpp",
MAME_DIR .. "src/emu/hashfile.h",
@@ -61,16 +46,8 @@ files {
MAME_DIR .. "src/emu/addrmap.h",
MAME_DIR .. "src/emu/attotime.cpp",
MAME_DIR .. "src/emu/attotime.h",
- MAME_DIR .. "src/emu/audit.cpp",
- MAME_DIR .. "src/emu/audit.h",
MAME_DIR .. "src/emu/bookkeeping.cpp",
MAME_DIR .. "src/emu/bookkeeping.h",
- MAME_DIR .. "src/emu/cheat.cpp",
- MAME_DIR .. "src/emu/cheat.h",
- MAME_DIR .. "src/emu/clifront.cpp",
- MAME_DIR .. "src/emu/clifront.h",
- MAME_DIR .. "src/emu/cliopts.cpp",
- MAME_DIR .. "src/emu/cliopts.h",
MAME_DIR .. "src/emu/config.cpp",
MAME_DIR .. "src/emu/config.h",
MAME_DIR .. "src/emu/crsshair.cpp",
@@ -87,6 +64,7 @@ files {
MAME_DIR .. "src/emu/devfind.h",
MAME_DIR .. "src/emu/device.cpp",
MAME_DIR .. "src/emu/device.h",
+ MAME_DIR .. "src/emu/device.ipp",
MAME_DIR .. "src/emu/didisasm.cpp",
MAME_DIR .. "src/emu/didisasm.h",
MAME_DIR .. "src/emu/diexec.cpp",
@@ -132,6 +110,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",
@@ -142,31 +122,23 @@ files {
MAME_DIR .. "src/emu/hash.h",
MAME_DIR .. "src/emu/image.cpp",
MAME_DIR .. "src/emu/image.h",
- MAME_DIR .. "src/emu/info.cpp",
- MAME_DIR .. "src/emu/info.h",
MAME_DIR .. "src/emu/input.cpp",
MAME_DIR .. "src/emu/input.h",
MAME_DIR .. "src/emu/ioport.cpp",
MAME_DIR .. "src/emu/ioport.h",
MAME_DIR .. "src/emu/inpttype.h",
- MAME_DIR .. "src/emu/luaengine.cpp",
- MAME_DIR .. "src/emu/luaengine.h",
- MAME_DIR .. "src/emu/language.cpp",
- MAME_DIR .. "src/emu/language.h",
- MAME_DIR .. "src/emu/mame.cpp",
- MAME_DIR .. "src/emu/mame.h",
MAME_DIR .. "src/emu/machine.cpp",
MAME_DIR .. "src/emu/machine.h",
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",
MAME_DIR .. "src/emu/parameters.h",
+ MAME_DIR .. "src/emu/profiler.cpp",
+ MAME_DIR .. "src/emu/profiler.h",
MAME_DIR .. "src/emu/output.cpp",
MAME_DIR .. "src/emu/output.h",
MAME_DIR .. "src/emu/render.cpp",
@@ -191,100 +163,20 @@ files {
MAME_DIR .. "src/emu/sound.h",
MAME_DIR .. "src/emu/speaker.cpp",
MAME_DIR .. "src/emu/speaker.h",
- MAME_DIR .. "src/emu/sprite.cpp",
- MAME_DIR .. "src/emu/sprite.h",
MAME_DIR .. "src/emu/tilemap.cpp",
MAME_DIR .. "src/emu/tilemap.h",
MAME_DIR .. "src/emu/timer.cpp",
MAME_DIR .. "src/emu/timer.h",
MAME_DIR .. "src/emu/uiinput.cpp",
MAME_DIR .. "src/emu/uiinput.h",
- MAME_DIR .. "src/emu/ui/ui.cpp",
- MAME_DIR .. "src/emu/ui/ui.h",
- 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/mainmenu.cpp",
- MAME_DIR .. "src/emu/ui/mainmenu.h",
- MAME_DIR .. "src/emu/ui/miscmenu.cpp",
- MAME_DIR .. "src/emu/ui/miscmenu.h",
- MAME_DIR .. "src/emu/ui/barcode.cpp",
- 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/devopt.cpp",
- MAME_DIR .. "src/emu/ui/devopt.h",
- MAME_DIR .. "src/emu/ui/filemngr.cpp",
- MAME_DIR .. "src/emu/ui/filemngr.h",
- MAME_DIR .. "src/emu/ui/filesel.cpp",
- MAME_DIR .. "src/emu/ui/filesel.h",
- MAME_DIR .. "src/emu/ui/imgcntrl.cpp",
- MAME_DIR .. "src/emu/ui/imgcntrl.h",
- MAME_DIR .. "src/emu/ui/info.cpp",
- MAME_DIR .. "src/emu/ui/info.h",
- MAME_DIR .. "src/emu/ui/info_pty.cpp",
- MAME_DIR .. "src/emu/ui/info_pty.h",
- MAME_DIR .. "src/emu/ui/inputmap.cpp",
- MAME_DIR .. "src/emu/ui/inputmap.h",
- MAME_DIR .. "src/emu/ui/sliders.cpp",
- MAME_DIR .. "src/emu/ui/sliders.h",
- MAME_DIR .. "src/emu/ui/slotopt.cpp",
- MAME_DIR .. "src/emu/ui/slotopt.h",
- MAME_DIR .. "src/emu/ui/swlist.cpp",
- MAME_DIR .. "src/emu/ui/swlist.h",
- MAME_DIR .. "src/emu/ui/tapectrl.cpp",
- MAME_DIR .. "src/emu/ui/tapectrl.h",
- MAME_DIR .. "src/emu/ui/videoopt.cpp",
- MAME_DIR .. "src/emu/ui/videoopt.h",
- MAME_DIR .. "src/emu/ui/viewgfx.cpp",
- MAME_DIR .. "src/emu/ui/viewgfx.h",
- MAME_DIR .. "src/emu/ui/auditmenu.cpp",
- 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",
- MAME_DIR .. "src/emu/ui/custui.h",
- MAME_DIR .. "src/emu/ui/datfile.cpp",
- MAME_DIR .. "src/emu/ui/datfile.h",
- MAME_DIR .. "src/emu/ui/datmenu.cpp",
- MAME_DIR .. "src/emu/ui/datmenu.h",
- 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",
- MAME_DIR .. "src/emu/ui/miscmenu.cpp",
- MAME_DIR .. "src/emu/ui/miscmenu.h",
- MAME_DIR .. "src/emu/ui/moptions.cpp",
- MAME_DIR .. "src/emu/ui/moptions.h",
- MAME_DIR .. "src/emu/ui/optsmenu.cpp",
- MAME_DIR .. "src/emu/ui/optsmenu.h",
- MAME_DIR .. "src/emu/ui/selector.cpp",
- MAME_DIR .. "src/emu/ui/selector.h",
- MAME_DIR .. "src/emu/ui/selgame.cpp",
- MAME_DIR .. "src/emu/ui/selgame.h",
- MAME_DIR .. "src/emu/ui/simpleselgame.cpp",
- MAME_DIR .. "src/emu/ui/simpleselgame.h",
- MAME_DIR .. "src/emu/ui/selsoft.cpp",
- MAME_DIR .. "src/emu/ui/selsoft.h",
- MAME_DIR .. "src/emu/ui/sndmenu.cpp",
- MAME_DIR .. "src/emu/ui/sndmenu.h",
- MAME_DIR .. "src/emu/ui/starimg.h",
- MAME_DIR .. "src/emu/ui/toolbar.h",
- MAME_DIR .. "src/emu/ui/utils.cpp",
- MAME_DIR .. "src/emu/ui/utils.h",
MAME_DIR .. "src/emu/validity.cpp",
MAME_DIR .. "src/emu/validity.h",
MAME_DIR .. "src/emu/video.cpp",
MAME_DIR .. "src/emu/video.h",
MAME_DIR .. "src/emu/rendersw.inc",
+ MAME_DIR .. "src/emu/ui/uimain.h",
+ MAME_DIR .. "src/emu/ui/cmdrender.h", -- TODO: remove
+ MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove
MAME_DIR .. "src/emu/debug/debugcmd.cpp",
MAME_DIR .. "src/emu/debug/debugcmd.h",
MAME_DIR .. "src/emu/debug/debugcon.cpp",
@@ -311,65 +203,8 @@ files {
MAME_DIR .. "src/emu/debug/express.h",
MAME_DIR .. "src/emu/debug/textbuf.cpp",
MAME_DIR .. "src/emu/debug/textbuf.h",
- MAME_DIR .. "src/emu/profiler.cpp",
- MAME_DIR .. "src/emu/profiler.h",
- MAME_DIR .. "src/emu/sound/filter.cpp",
- MAME_DIR .. "src/emu/sound/filter.h",
- MAME_DIR .. "src/devices/sound/flt_vol.cpp",
- MAME_DIR .. "src/devices/sound/flt_vol.h",
- MAME_DIR .. "src/devices/sound/flt_rc.cpp",
- MAME_DIR .. "src/devices/sound/flt_rc.h",
- MAME_DIR .. "src/emu/sound/wavwrite.cpp",
- MAME_DIR .. "src/emu/sound/wavwrite.h",
- MAME_DIR .. "src/devices/sound/samples.cpp",
- MAME_DIR .. "src/devices/sound/samples.h",
MAME_DIR .. "src/emu/drivers/empty.cpp",
- MAME_DIR .. "src/emu/drivers/testcpu.cpp",
MAME_DIR .. "src/emu/drivers/xtal.h",
- MAME_DIR .. "src/devices/machine/bcreader.cpp",
- MAME_DIR .. "src/devices/machine/bcreader.h",
- MAME_DIR .. "src/devices/machine/buffer.cpp",
- MAME_DIR .. "src/devices/machine/buffer.h",
- MAME_DIR .. "src/devices/machine/clock.cpp",
- MAME_DIR .. "src/devices/machine/clock.h",
- MAME_DIR .. "src/devices/machine/keyboard.cpp",
- MAME_DIR .. "src/devices/machine/keyboard.h",
- MAME_DIR .. "src/devices/machine/laserdsc.cpp",
- MAME_DIR .. "src/devices/machine/laserdsc.h",
- MAME_DIR .. "src/devices/machine/latch.cpp",
- MAME_DIR .. "src/devices/machine/latch.h",
- MAME_DIR .. "src/devices/machine/nvram.cpp",
- MAME_DIR .. "src/devices/machine/nvram.h",
- MAME_DIR .. "src/devices/machine/ram.cpp",
- MAME_DIR .. "src/devices/machine/ram.h",
- MAME_DIR .. "src/devices/machine/legscsi.cpp",
- MAME_DIR .. "src/devices/machine/legscsi.h",
- MAME_DIR .. "src/devices/machine/terminal.cpp",
- MAME_DIR .. "src/devices/machine/terminal.h",
- MAME_DIR .. "src/devices/imagedev/bitbngr.cpp",
- MAME_DIR .. "src/devices/imagedev/bitbngr.h",
- MAME_DIR .. "src/devices/imagedev/cassette.cpp",
- MAME_DIR .. "src/devices/imagedev/cassette.h",
- MAME_DIR .. "src/devices/imagedev/chd_cd.cpp",
- MAME_DIR .. "src/devices/imagedev/chd_cd.h",
- MAME_DIR .. "src/devices/imagedev/diablo.cpp",
- MAME_DIR .. "src/devices/imagedev/diablo.h",
- MAME_DIR .. "src/devices/imagedev/flopdrv.cpp",
- MAME_DIR .. "src/devices/imagedev/flopdrv.h",
- MAME_DIR .. "src/devices/imagedev/floppy.cpp",
- MAME_DIR .. "src/devices/imagedev/floppy.h",
- MAME_DIR .. "src/devices/imagedev/harddriv.cpp",
- MAME_DIR .. "src/devices/imagedev/harddriv.h",
- MAME_DIR .. "src/devices/imagedev/mfmhd.cpp",
- MAME_DIR .. "src/devices/imagedev/mfmhd.h",
- MAME_DIR .. "src/devices/imagedev/midiin.cpp",
- MAME_DIR .. "src/devices/imagedev/midiin.h",
- MAME_DIR .. "src/devices/imagedev/midiout.cpp",
- MAME_DIR .. "src/devices/imagedev/midiout.h",
- MAME_DIR .. "src/devices/imagedev/printer.cpp",
- MAME_DIR .. "src/devices/imagedev/printer.h",
- MAME_DIR .. "src/devices/imagedev/snapquik.cpp",
- MAME_DIR .. "src/devices/imagedev/snapquik.h",
MAME_DIR .. "src/emu/video/generic.cpp",
MAME_DIR .. "src/emu/video/generic.h",
MAME_DIR .. "src/emu/video/resnet.cpp",
@@ -381,9 +216,6 @@ files {
MAME_DIR .. "src/emu/video/rgbsse.h",
MAME_DIR .. "src/emu/video/rgbvmx.cpp",
MAME_DIR .. "src/emu/video/rgbvmx.h",
- MAME_DIR .. "src/emu/video/vector.cpp",
- MAME_DIR .. "src/emu/video/vector.h",
- MAME_DIR .. "src/devices/video/poly.h",
}
dependency {
@@ -404,6 +236,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" },
@@ -411,8 +244,11 @@ dependency {
}
custombuildtask {
- { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }},
- { MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }},
+ { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }},
+}
+
+custombuildtask {
+ { MAME_DIR .. "src/frontend/mame/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }},
layoutbuildtask("emu/layout", "dualhovu"),
layoutbuildtask("emu/layout", "dualhsxs"),
@@ -423,6 +259,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"),
}
@@ -438,12 +275,7 @@ precompiledheaders()
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices", -- till deps are fixed
- MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
- MAME_DIR .. "3rdparty",
- GEN_DIR .. "emu",
- GEN_DIR .. "emu/layout",
}
files {
MAME_DIR .. "src/emu/drivers/empty.cpp",
diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua
index 7620389f5dc..aacd4da54d4 100644
--- a/docs/release/scripts/src/lib.lua
+++ b/docs/release/scripts/src/lib.lua
@@ -19,17 +19,10 @@ project "utils"
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
+ ext_includedir("expat"),
+ ext_includedir("zlib"),
+ ext_includedir("flac"),
}
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-zlib"] then
- includedirs {
- MAME_DIR .. "3rdparty/zlib",
- }
- end
files {
MAME_DIR .. "src/lib/util/bitstream.h",
@@ -71,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",
@@ -85,6 +79,7 @@ project "utils"
MAME_DIR .. "src/lib/util/pool.h",
MAME_DIR .. "src/lib/util/sha1.cpp",
MAME_DIR .. "src/lib/util/sha1.h",
+ MAME_DIR .. "src/lib/util/strformat.h",
MAME_DIR .. "src/lib/util/tagmap.h",
MAME_DIR .. "src/lib/util/unicode.cpp",
MAME_DIR .. "src/lib/util/unicode.h",
@@ -94,6 +89,9 @@ project "utils"
MAME_DIR .. "src/lib/util/un7z.h",
MAME_DIR .. "src/lib/util/vbiparse.cpp",
MAME_DIR .. "src/lib/util/vbiparse.h",
+ MAME_DIR .. "src/lib/util/vecstream.h",
+ MAME_DIR .. "src/lib/util/wavwrite.cpp",
+ MAME_DIR .. "src/lib/util/wavwrite.h",
MAME_DIR .. "src/lib/util/xmlfile.cpp",
MAME_DIR .. "src/lib/util/xmlfile.h",
MAME_DIR .. "src/lib/util/zippath.cpp",
@@ -117,17 +115,12 @@ project "formats"
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
+ ext_includedir("zlib"),
}
- if _OPTIONS["with-bundled-zlib"] then
- includedirs {
- MAME_DIR .. "3rdparty/zlib",
- }
- end
-
files {
- MAME_DIR .. "src/lib/formats/2d_dsk.cpp",
- MAME_DIR .. "src/lib/formats/2d_dsk.h",
+-- MAME_DIR .. "src/lib/formats/2d_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/2d_dsk.h",
MAME_DIR .. "src/lib/formats/cassimg.cpp",
MAME_DIR .. "src/lib/formats/cassimg.h",
MAME_DIR .. "src/lib/formats/flopimg.cpp",
@@ -136,299 +129,299 @@ project "formats"
MAME_DIR .. "src/lib/formats/imageutl.h",
MAME_DIR .. "src/lib/formats/ioprocs.cpp",
MAME_DIR .. "src/lib/formats/ioprocs.h",
- MAME_DIR .. "src/lib/formats/basicdsk.cpp",
- MAME_DIR .. "src/lib/formats/basicdsk.h",
- MAME_DIR .. "src/lib/formats/a26_cas.cpp",
- MAME_DIR .. "src/lib/formats/a26_cas.h",
- MAME_DIR .. "src/lib/formats/a5105_dsk.cpp",
- MAME_DIR .. "src/lib/formats/a5105_dsk.h",
- MAME_DIR .. "src/lib/formats/abc800_dsk.cpp",
- MAME_DIR .. "src/lib/formats/abc800_dsk.h",
- MAME_DIR .. "src/lib/formats/abcfd2_dsk.cpp",
- MAME_DIR .. "src/lib/formats/abcfd2_dsk.h",
- MAME_DIR .. "src/lib/formats/ace_tap.cpp",
- MAME_DIR .. "src/lib/formats/ace_tap.h",
- MAME_DIR .. "src/lib/formats/adam_cas.cpp",
- MAME_DIR .. "src/lib/formats/adam_cas.h",
- MAME_DIR .. "src/lib/formats/adam_dsk.cpp",
- MAME_DIR .. "src/lib/formats/adam_dsk.h",
- MAME_DIR .. "src/lib/formats/ami_dsk.cpp",
- MAME_DIR .. "src/lib/formats/ami_dsk.h",
- MAME_DIR .. "src/lib/formats/ap2_dsk.cpp",
- MAME_DIR .. "src/lib/formats/ap2_dsk.h",
- MAME_DIR .. "src/lib/formats/apf_apt.cpp",
- MAME_DIR .. "src/lib/formats/apf_apt.h",
- MAME_DIR .. "src/lib/formats/apridisk.cpp",
- MAME_DIR .. "src/lib/formats/apridisk.h",
- MAME_DIR .. "src/lib/formats/apollo_dsk.cpp",
- MAME_DIR .. "src/lib/formats/apollo_dsk.h",
- MAME_DIR .. "src/lib/formats/ap_dsk35.cpp",
- MAME_DIR .. "src/lib/formats/ap_dsk35.h",
- MAME_DIR .. "src/lib/formats/applix_dsk.cpp",
- MAME_DIR .. "src/lib/formats/applix_dsk.h",
- MAME_DIR .. "src/lib/formats/asst128_dsk.cpp",
- MAME_DIR .. "src/lib/formats/asst128_dsk.h",
- MAME_DIR .. "src/lib/formats/atari_dsk.cpp",
- MAME_DIR .. "src/lib/formats/atari_dsk.h",
- MAME_DIR .. "src/lib/formats/atom_dsk.cpp",
- MAME_DIR .. "src/lib/formats/atom_dsk.h",
- MAME_DIR .. "src/lib/formats/atom_tap.cpp",
- MAME_DIR .. "src/lib/formats/atom_tap.h",
- MAME_DIR .. "src/lib/formats/bbc_dsk.cpp",
- MAME_DIR .. "src/lib/formats/bbc_dsk.h",
- MAME_DIR .. "src/lib/formats/bw2_dsk.cpp",
- MAME_DIR .. "src/lib/formats/bw2_dsk.h",
- MAME_DIR .. "src/lib/formats/bw12_dsk.cpp",
- MAME_DIR .. "src/lib/formats/bw12_dsk.h",
- MAME_DIR .. "src/lib/formats/c3040_dsk.cpp",
- MAME_DIR .. "src/lib/formats/c3040_dsk.h",
- MAME_DIR .. "src/lib/formats/c4040_dsk.cpp",
- MAME_DIR .. "src/lib/formats/c4040_dsk.h",
- MAME_DIR .. "src/lib/formats/c8280_dsk.cpp",
- MAME_DIR .. "src/lib/formats/c8280_dsk.h",
- MAME_DIR .. "src/lib/formats/camplynx_cas.cpp",
- MAME_DIR .. "src/lib/formats/camplynx_cas.h",
- MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp",
- MAME_DIR .. "src/lib/formats/camplynx_dsk.h",
- MAME_DIR .. "src/lib/formats/cbm_crt.cpp",
- MAME_DIR .. "src/lib/formats/cbm_crt.h",
- MAME_DIR .. "src/lib/formats/cbm_tap.cpp",
- MAME_DIR .. "src/lib/formats/cbm_tap.h",
- MAME_DIR .. "src/lib/formats/ccvf_dsk.cpp",
- MAME_DIR .. "src/lib/formats/ccvf_dsk.h",
- MAME_DIR .. "src/lib/formats/cd90_640_dsk.cpp",
- MAME_DIR .. "src/lib/formats/cd90_640_dsk.h",
- MAME_DIR .. "src/lib/formats/cgen_cas.cpp",
- MAME_DIR .. "src/lib/formats/cgen_cas.h",
- MAME_DIR .. "src/lib/formats/cgenie_dsk.cpp",
- MAME_DIR .. "src/lib/formats/cgenie_dsk.h",
- MAME_DIR .. "src/lib/formats/coco_cas.cpp",
- MAME_DIR .. "src/lib/formats/coco_cas.h",
- MAME_DIR .. "src/lib/formats/comx35_dsk.cpp",
- MAME_DIR .. "src/lib/formats/comx35_dsk.h",
- MAME_DIR .. "src/lib/formats/concept_dsk.cpp",
- MAME_DIR .. "src/lib/formats/concept_dsk.h",
- MAME_DIR .. "src/lib/formats/coupedsk.cpp",
- MAME_DIR .. "src/lib/formats/coupedsk.h",
- MAME_DIR .. "src/lib/formats/cpis_dsk.cpp",
- MAME_DIR .. "src/lib/formats/cpis_dsk.h",
+-- MAME_DIR .. "src/lib/formats/basicdsk.cpp",
+-- MAME_DIR .. "src/lib/formats/basicdsk.h",
+-- MAME_DIR .. "src/lib/formats/a26_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/a26_cas.h",
+-- MAME_DIR .. "src/lib/formats/a5105_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/a5105_dsk.h",
+-- MAME_DIR .. "src/lib/formats/abc800_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/abc800_dsk.h",
+-- MAME_DIR .. "src/lib/formats/abcfd2_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/abcfd2_dsk.h",
+-- MAME_DIR .. "src/lib/formats/ace_tap.cpp",
+-- MAME_DIR .. "src/lib/formats/ace_tap.h",
+-- MAME_DIR .. "src/lib/formats/adam_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/adam_cas.h",
+-- MAME_DIR .. "src/lib/formats/adam_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/adam_dsk.h",
+-- MAME_DIR .. "src/lib/formats/ami_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/ami_dsk.h",
+-- MAME_DIR .. "src/lib/formats/ap2_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/ap2_dsk.h",
+-- MAME_DIR .. "src/lib/formats/apf_apt.cpp",
+-- MAME_DIR .. "src/lib/formats/apf_apt.h",
+-- MAME_DIR .. "src/lib/formats/apridisk.cpp",
+-- MAME_DIR .. "src/lib/formats/apridisk.h",
+-- MAME_DIR .. "src/lib/formats/apollo_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/apollo_dsk.h",
+-- MAME_DIR .. "src/lib/formats/ap_dsk35.cpp",
+-- MAME_DIR .. "src/lib/formats/ap_dsk35.h",
+-- MAME_DIR .. "src/lib/formats/applix_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/applix_dsk.h",
+-- MAME_DIR .. "src/lib/formats/asst128_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/asst128_dsk.h",
+-- MAME_DIR .. "src/lib/formats/atari_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/atari_dsk.h",
+-- MAME_DIR .. "src/lib/formats/atom_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/atom_dsk.h",
+-- MAME_DIR .. "src/lib/formats/atom_tap.cpp",
+-- MAME_DIR .. "src/lib/formats/atom_tap.h",
+-- MAME_DIR .. "src/lib/formats/bbc_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/bbc_dsk.h",
+-- MAME_DIR .. "src/lib/formats/bw2_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/bw2_dsk.h",
+-- MAME_DIR .. "src/lib/formats/bw12_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/bw12_dsk.h",
+-- MAME_DIR .. "src/lib/formats/c3040_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/c3040_dsk.h",
+-- MAME_DIR .. "src/lib/formats/c4040_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/c4040_dsk.h",
+-- MAME_DIR .. "src/lib/formats/c8280_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/c8280_dsk.h",
+-- MAME_DIR .. "src/lib/formats/camplynx_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/camplynx_cas.h",
+-- MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/camplynx_dsk.h",
+-- MAME_DIR .. "src/lib/formats/cbm_crt.cpp",
+-- MAME_DIR .. "src/lib/formats/cbm_crt.h",
+-- MAME_DIR .. "src/lib/formats/cbm_tap.cpp",
+-- MAME_DIR .. "src/lib/formats/cbm_tap.h",
+-- MAME_DIR .. "src/lib/formats/ccvf_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/ccvf_dsk.h",
+-- MAME_DIR .. "src/lib/formats/cd90_640_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/cd90_640_dsk.h",
+-- MAME_DIR .. "src/lib/formats/cgen_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/cgen_cas.h",
+-- MAME_DIR .. "src/lib/formats/cgenie_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/cgenie_dsk.h",
+-- MAME_DIR .. "src/lib/formats/coco_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/coco_cas.h",
+-- MAME_DIR .. "src/lib/formats/comx35_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/comx35_dsk.h",
+-- MAME_DIR .. "src/lib/formats/concept_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/concept_dsk.h",
+-- MAME_DIR .. "src/lib/formats/coupedsk.cpp",
+-- MAME_DIR .. "src/lib/formats/coupedsk.h",
+-- MAME_DIR .. "src/lib/formats/cpis_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/cpis_dsk.h",
MAME_DIR .. "src/lib/formats/cqm_dsk.cpp",
MAME_DIR .. "src/lib/formats/cqm_dsk.h",
- MAME_DIR .. "src/lib/formats/csw_cas.cpp",
- MAME_DIR .. "src/lib/formats/csw_cas.h",
- MAME_DIR .. "src/lib/formats/d64_dsk.cpp",
- MAME_DIR .. "src/lib/formats/d64_dsk.h",
- MAME_DIR .. "src/lib/formats/d71_dsk.cpp",
- MAME_DIR .. "src/lib/formats/d71_dsk.h",
- MAME_DIR .. "src/lib/formats/d80_dsk.cpp",
- MAME_DIR .. "src/lib/formats/d80_dsk.h",
- MAME_DIR .. "src/lib/formats/d81_dsk.cpp",
- MAME_DIR .. "src/lib/formats/d81_dsk.h",
- MAME_DIR .. "src/lib/formats/d82_dsk.cpp",
- MAME_DIR .. "src/lib/formats/d82_dsk.h",
+-- MAME_DIR .. "src/lib/formats/csw_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/csw_cas.h",
+-- MAME_DIR .. "src/lib/formats/d64_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/d64_dsk.h",
+-- MAME_DIR .. "src/lib/formats/d71_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/d71_dsk.h",
+-- MAME_DIR .. "src/lib/formats/d80_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/d80_dsk.h",
+-- MAME_DIR .. "src/lib/formats/d81_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/d81_dsk.h",
+-- MAME_DIR .. "src/lib/formats/d82_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/d82_dsk.h",
MAME_DIR .. "src/lib/formats/d88_dsk.cpp",
MAME_DIR .. "src/lib/formats/d88_dsk.h",
- MAME_DIR .. "src/lib/formats/dcp_dsk.cpp",
- MAME_DIR .. "src/lib/formats/dcp_dsk.h",
+-- MAME_DIR .. "src/lib/formats/dcp_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/dcp_dsk.h",
MAME_DIR .. "src/lib/formats/dfi_dsk.cpp",
MAME_DIR .. "src/lib/formats/dfi_dsk.h",
- MAME_DIR .. "src/lib/formats/dim_dsk.cpp",
- MAME_DIR .. "src/lib/formats/dim_dsk.h",
- MAME_DIR .. "src/lib/formats/dip_dsk.cpp",
- MAME_DIR .. "src/lib/formats/dip_dsk.h",
- MAME_DIR .. "src/lib/formats/dmk_dsk.cpp",
- MAME_DIR .. "src/lib/formats/dmk_dsk.h",
- MAME_DIR .. "src/lib/formats/dmv_dsk.cpp",
- MAME_DIR .. "src/lib/formats/dmv_dsk.h",
+-- MAME_DIR .. "src/lib/formats/dim_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/dim_dsk.h",
+-- MAME_DIR .. "src/lib/formats/dip_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/dip_dsk.h",
+-- MAME_DIR .. "src/lib/formats/dmk_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/dmk_dsk.h",
+-- MAME_DIR .. "src/lib/formats/dmv_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/dmv_dsk.h",
MAME_DIR .. "src/lib/formats/dsk_dsk.cpp",
MAME_DIR .. "src/lib/formats/dsk_dsk.h",
- MAME_DIR .. "src/lib/formats/ep64_dsk.cpp",
- MAME_DIR .. "src/lib/formats/ep64_dsk.h",
- MAME_DIR .. "src/lib/formats/esq8_dsk.cpp",
- MAME_DIR .. "src/lib/formats/esq8_dsk.h",
- MAME_DIR .. "src/lib/formats/esq16_dsk.cpp",
- MAME_DIR .. "src/lib/formats/esq16_dsk.h",
- MAME_DIR .. "src/lib/formats/excali64_dsk.cpp",
- MAME_DIR .. "src/lib/formats/excali64_dsk.h",
- MAME_DIR .. "src/lib/formats/fc100_cas.cpp",
- MAME_DIR .. "src/lib/formats/fc100_cas.h",
+-- MAME_DIR .. "src/lib/formats/ep64_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/ep64_dsk.h",
+-- MAME_DIR .. "src/lib/formats/esq8_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/esq8_dsk.h",
+-- MAME_DIR .. "src/lib/formats/esq16_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/esq16_dsk.h",
+-- MAME_DIR .. "src/lib/formats/excali64_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/excali64_dsk.h",
+-- MAME_DIR .. "src/lib/formats/fc100_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/fc100_cas.h",
MAME_DIR .. "src/lib/formats/fdi_dsk.cpp",
MAME_DIR .. "src/lib/formats/fdd_dsk.cpp",
- MAME_DIR .. "src/lib/formats/fdd_dsk.h",
- MAME_DIR .. "src/lib/formats/flex_dsk.cpp",
- MAME_DIR .. "src/lib/formats/flex_dsk.h",
- MAME_DIR .. "src/lib/formats/fm7_cas.cpp",
- MAME_DIR .. "src/lib/formats/fm7_cas.h",
- MAME_DIR .. "src/lib/formats/fmsx_cas.cpp",
- MAME_DIR .. "src/lib/formats/fmsx_cas.h",
- MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp",
- MAME_DIR .. "src/lib/formats/fmtowns_dsk.h",
- MAME_DIR .. "src/lib/formats/fsd_dsk.cpp",
- MAME_DIR .. "src/lib/formats/fsd_dsk.h",
- MAME_DIR .. "src/lib/formats/g64_dsk.cpp",
- MAME_DIR .. "src/lib/formats/g64_dsk.h",
- MAME_DIR .. "src/lib/formats/gtp_cas.cpp",
- MAME_DIR .. "src/lib/formats/gtp_cas.h",
- MAME_DIR .. "src/lib/formats/guab_dsk.cpp",
- MAME_DIR .. "src/lib/formats/guab_dsk.h",
- MAME_DIR .. "src/lib/formats/hect_dsk.cpp",
- MAME_DIR .. "src/lib/formats/hect_dsk.h",
- MAME_DIR .. "src/lib/formats/hect_tap.cpp",
- MAME_DIR .. "src/lib/formats/hect_tap.h",
- MAME_DIR .. "src/lib/formats/hector_minidisc.cpp",
- MAME_DIR .. "src/lib/formats/hector_minidisc.h",
- MAME_DIR .. "src/lib/formats/iq151_dsk.cpp",
- MAME_DIR .. "src/lib/formats/iq151_dsk.h",
+-- MAME_DIR .. "src/lib/formats/fdd_dsk.h",
+-- MAME_DIR .. "src/lib/formats/flex_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/flex_dsk.h",
+-- MAME_DIR .. "src/lib/formats/fm7_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/fm7_cas.h",
+-- MAME_DIR .. "src/lib/formats/fmsx_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/fmsx_cas.h",
+-- MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/fmtowns_dsk.h",
+-- MAME_DIR .. "src/lib/formats/fsd_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/fsd_dsk.h",
+-- MAME_DIR .. "src/lib/formats/g64_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/g64_dsk.h",
+-- MAME_DIR .. "src/lib/formats/gtp_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/gtp_cas.h",
+-- MAME_DIR .. "src/lib/formats/guab_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/guab_dsk.h",
+-- MAME_DIR .. "src/lib/formats/hect_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/hect_dsk.h",
+-- MAME_DIR .. "src/lib/formats/hect_tap.cpp",
+-- MAME_DIR .. "src/lib/formats/hect_tap.h",
+-- MAME_DIR .. "src/lib/formats/hector_minidisc.cpp",
+-- MAME_DIR .. "src/lib/formats/hector_minidisc.h",
+-- MAME_DIR .. "src/lib/formats/iq151_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/iq151_dsk.h",
MAME_DIR .. "src/lib/formats/imd_dsk.cpp",
MAME_DIR .. "src/lib/formats/imd_dsk.h",
MAME_DIR .. "src/lib/formats/ipf_dsk.cpp",
MAME_DIR .. "src/lib/formats/ipf_dsk.h",
- MAME_DIR .. "src/lib/formats/jvc_dsk.cpp",
- MAME_DIR .. "src/lib/formats/jvc_dsk.h",
- MAME_DIR .. "src/lib/formats/kaypro_dsk.cpp",
- MAME_DIR .. "src/lib/formats/kaypro_dsk.h",
- MAME_DIR .. "src/lib/formats/kc_cas.cpp",
- MAME_DIR .. "src/lib/formats/kc_cas.h",
- MAME_DIR .. "src/lib/formats/kc85_dsk.cpp",
- MAME_DIR .. "src/lib/formats/kc85_dsk.h",
- MAME_DIR .. "src/lib/formats/kim1_cas.cpp",
- MAME_DIR .. "src/lib/formats/kim1_cas.h",
- MAME_DIR .. "src/lib/formats/lviv_lvt.cpp",
- MAME_DIR .. "src/lib/formats/lviv_lvt.h",
- MAME_DIR .. "src/lib/formats/m20_dsk.cpp",
- MAME_DIR .. "src/lib/formats/m20_dsk.h",
- MAME_DIR .. "src/lib/formats/m5_dsk.cpp",
- MAME_DIR .. "src/lib/formats/m5_dsk.h",
- MAME_DIR .. "src/lib/formats/mbee_cas.cpp",
- MAME_DIR .. "src/lib/formats/mbee_cas.h",
- MAME_DIR .. "src/lib/formats/mm_dsk.cpp",
- MAME_DIR .. "src/lib/formats/mm_dsk.h",
- MAME_DIR .. "src/lib/formats/msx_dsk.cpp",
- MAME_DIR .. "src/lib/formats/msx_dsk.h",
+-- MAME_DIR .. "src/lib/formats/jvc_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/jvc_dsk.h",
+-- MAME_DIR .. "src/lib/formats/kaypro_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/kaypro_dsk.h",
+-- MAME_DIR .. "src/lib/formats/kc_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/kc_cas.h",
+-- MAME_DIR .. "src/lib/formats/kc85_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/kc85_dsk.h",
+-- MAME_DIR .. "src/lib/formats/kim1_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/kim1_cas.h",
+-- MAME_DIR .. "src/lib/formats/lviv_lvt.cpp",
+-- MAME_DIR .. "src/lib/formats/lviv_lvt.h",
+-- MAME_DIR .. "src/lib/formats/m20_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/m20_dsk.h",
+-- MAME_DIR .. "src/lib/formats/m5_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/m5_dsk.h",
+-- MAME_DIR .. "src/lib/formats/mbee_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/mbee_cas.h",
+-- MAME_DIR .. "src/lib/formats/mm_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/mm_dsk.h",
+-- MAME_DIR .. "src/lib/formats/msx_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/msx_dsk.h",
MAME_DIR .. "src/lib/formats/mfi_dsk.cpp",
MAME_DIR .. "src/lib/formats/mfi_dsk.h",
- MAME_DIR .. "src/lib/formats/mfm_hd.cpp",
- MAME_DIR .. "src/lib/formats/mfm_hd.h",
- MAME_DIR .. "src/lib/formats/mz_cas.cpp",
- MAME_DIR .. "src/lib/formats/mz_cas.h",
- MAME_DIR .. "src/lib/formats/nanos_dsk.cpp",
- MAME_DIR .. "src/lib/formats/nanos_dsk.h",
- MAME_DIR .. "src/lib/formats/nascom_dsk.cpp",
- MAME_DIR .. "src/lib/formats/nascom_dsk.h",
- MAME_DIR .. "src/lib/formats/naslite_dsk.cpp",
- MAME_DIR .. "src/lib/formats/naslite_dsk.h",
- MAME_DIR .. "src/lib/formats/nes_dsk.cpp",
- MAME_DIR .. "src/lib/formats/nes_dsk.h",
- MAME_DIR .. "src/lib/formats/nfd_dsk.cpp",
- MAME_DIR .. "src/lib/formats/nfd_dsk.h",
- MAME_DIR .. "src/lib/formats/orao_cas.cpp",
- MAME_DIR .. "src/lib/formats/orao_cas.h",
- MAME_DIR .. "src/lib/formats/oric_dsk.cpp",
- MAME_DIR .. "src/lib/formats/oric_dsk.h",
- MAME_DIR .. "src/lib/formats/oric_tap.cpp",
- MAME_DIR .. "src/lib/formats/oric_tap.h",
- MAME_DIR .. "src/lib/formats/p6001_cas.cpp",
- MAME_DIR .. "src/lib/formats/p6001_cas.h",
- MAME_DIR .. "src/lib/formats/pasti_dsk.cpp",
- MAME_DIR .. "src/lib/formats/pasti_dsk.h",
- MAME_DIR .. "src/lib/formats/pc_dsk.cpp",
- MAME_DIR .. "src/lib/formats/pc_dsk.h",
- MAME_DIR .. "src/lib/formats/pc98_dsk.cpp",
- MAME_DIR .. "src/lib/formats/pc98_dsk.h",
- MAME_DIR .. "src/lib/formats/pc98fdi_dsk.cpp",
- MAME_DIR .. "src/lib/formats/pc98fdi_dsk.h",
- MAME_DIR .. "src/lib/formats/phc25_cas.cpp",
- MAME_DIR .. "src/lib/formats/phc25_cas.h",
- MAME_DIR .. "src/lib/formats/pk8020_dsk.cpp",
- MAME_DIR .. "src/lib/formats/pk8020_dsk.h",
- MAME_DIR .. "src/lib/formats/pmd_cas.cpp",
- MAME_DIR .. "src/lib/formats/pmd_cas.h",
- MAME_DIR .. "src/lib/formats/primoptp.cpp",
- MAME_DIR .. "src/lib/formats/primoptp.h",
- MAME_DIR .. "src/lib/formats/pyldin_dsk.cpp",
- MAME_DIR .. "src/lib/formats/pyldin_dsk.h",
- MAME_DIR .. "src/lib/formats/ql_dsk.cpp",
- MAME_DIR .. "src/lib/formats/ql_dsk.h",
- MAME_DIR .. "src/lib/formats/rk_cas.cpp",
- MAME_DIR .. "src/lib/formats/rk_cas.h",
- MAME_DIR .. "src/lib/formats/rx50_dsk.cpp",
- MAME_DIR .. "src/lib/formats/rx50_dsk.h",
- MAME_DIR .. "src/lib/formats/sc3000_bit.cpp",
- MAME_DIR .. "src/lib/formats/sc3000_bit.h",
- MAME_DIR .. "src/lib/formats/sf7000_dsk.cpp",
- MAME_DIR .. "src/lib/formats/sf7000_dsk.h",
- MAME_DIR .. "src/lib/formats/smx_dsk.cpp",
- MAME_DIR .. "src/lib/formats/smx_dsk.h",
- MAME_DIR .. "src/lib/formats/sol_cas.cpp",
- MAME_DIR .. "src/lib/formats/sol_cas.h",
- MAME_DIR .. "src/lib/formats/sorc_dsk.cpp",
- MAME_DIR .. "src/lib/formats/sorc_dsk.h",
- MAME_DIR .. "src/lib/formats/sorc_cas.cpp",
- MAME_DIR .. "src/lib/formats/sorc_cas.h",
- MAME_DIR .. "src/lib/formats/sord_cas.cpp",
- MAME_DIR .. "src/lib/formats/sord_cas.h",
- MAME_DIR .. "src/lib/formats/spc1000_cas.cpp",
- MAME_DIR .. "src/lib/formats/spc1000_cas.h",
- MAME_DIR .. "src/lib/formats/st_dsk.cpp",
- MAME_DIR .. "src/lib/formats/st_dsk.h",
- MAME_DIR .. "src/lib/formats/svi_cas.cpp",
- MAME_DIR .. "src/lib/formats/svi_cas.h",
- MAME_DIR .. "src/lib/formats/svi_dsk.cpp",
- MAME_DIR .. "src/lib/formats/svi_dsk.h",
- MAME_DIR .. "src/lib/formats/tandy2k_dsk.cpp",
- MAME_DIR .. "src/lib/formats/tandy2k_dsk.h",
+-- MAME_DIR .. "src/lib/formats/mfm_hd.cpp",
+-- MAME_DIR .. "src/lib/formats/mfm_hd.h",
+-- MAME_DIR .. "src/lib/formats/mz_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/mz_cas.h",
+-- MAME_DIR .. "src/lib/formats/nanos_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/nanos_dsk.h",
+-- MAME_DIR .. "src/lib/formats/nascom_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/nascom_dsk.h",
+-- MAME_DIR .. "src/lib/formats/naslite_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/naslite_dsk.h",
+-- MAME_DIR .. "src/lib/formats/nes_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/nes_dsk.h",
+-- MAME_DIR .. "src/lib/formats/nfd_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/nfd_dsk.h",
+-- MAME_DIR .. "src/lib/formats/orao_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/orao_cas.h",
+-- MAME_DIR .. "src/lib/formats/oric_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/oric_dsk.h",
+-- MAME_DIR .. "src/lib/formats/oric_tap.cpp",
+-- MAME_DIR .. "src/lib/formats/oric_tap.h",
+-- MAME_DIR .. "src/lib/formats/p6001_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/p6001_cas.h",
+-- MAME_DIR .. "src/lib/formats/pasti_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/pasti_dsk.h",
+-- MAME_DIR .. "src/lib/formats/pc_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/pc_dsk.h",
+-- MAME_DIR .. "src/lib/formats/pc98_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/pc98_dsk.h",
+-- MAME_DIR .. "src/lib/formats/pc98fdi_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/pc98fdi_dsk.h",
+-- MAME_DIR .. "src/lib/formats/phc25_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/phc25_cas.h",
+-- MAME_DIR .. "src/lib/formats/pk8020_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/pk8020_dsk.h",
+-- MAME_DIR .. "src/lib/formats/pmd_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/pmd_cas.h",
+-- MAME_DIR .. "src/lib/formats/primoptp.cpp",
+-- MAME_DIR .. "src/lib/formats/primoptp.h",
+-- MAME_DIR .. "src/lib/formats/pyldin_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/pyldin_dsk.h",
+-- MAME_DIR .. "src/lib/formats/ql_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/ql_dsk.h",
+-- MAME_DIR .. "src/lib/formats/rk_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/rk_cas.h",
+-- MAME_DIR .. "src/lib/formats/rx50_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/rx50_dsk.h",
+-- MAME_DIR .. "src/lib/formats/sc3000_bit.cpp",
+-- MAME_DIR .. "src/lib/formats/sc3000_bit.h",
+-- MAME_DIR .. "src/lib/formats/sf7000_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/sf7000_dsk.h",
+-- MAME_DIR .. "src/lib/formats/smx_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/smx_dsk.h",
+-- MAME_DIR .. "src/lib/formats/sol_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/sol_cas.h",
+-- MAME_DIR .. "src/lib/formats/sorc_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/sorc_dsk.h",
+-- MAME_DIR .. "src/lib/formats/sorc_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/sorc_cas.h",
+-- MAME_DIR .. "src/lib/formats/sord_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/sord_cas.h",
+-- MAME_DIR .. "src/lib/formats/spc1000_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/spc1000_cas.h",
+-- MAME_DIR .. "src/lib/formats/st_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/st_dsk.h",
+-- MAME_DIR .. "src/lib/formats/svi_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/svi_cas.h",
+-- MAME_DIR .. "src/lib/formats/svi_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/svi_dsk.h",
+-- MAME_DIR .. "src/lib/formats/tandy2k_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/tandy2k_dsk.h",
MAME_DIR .. "src/lib/formats/td0_dsk.cpp",
MAME_DIR .. "src/lib/formats/td0_dsk.h",
- MAME_DIR .. "src/lib/formats/thom_cas.cpp",
- MAME_DIR .. "src/lib/formats/thom_cas.h",
- MAME_DIR .. "src/lib/formats/thom_dsk.cpp",
- MAME_DIR .. "src/lib/formats/thom_dsk.h",
- MAME_DIR .. "src/lib/formats/ti99_dsk.cpp",
- MAME_DIR .. "src/lib/formats/ti99_dsk.h",
- MAME_DIR .. "src/lib/formats/tiki100_dsk.cpp",
- MAME_DIR .. "src/lib/formats/tiki100_dsk.h",
- MAME_DIR .. "src/lib/formats/trd_dsk.cpp",
- MAME_DIR .. "src/lib/formats/trd_dsk.h",
- MAME_DIR .. "src/lib/formats/trs_cas.cpp",
- MAME_DIR .. "src/lib/formats/trs_cas.h",
- MAME_DIR .. "src/lib/formats/trs80_dsk.cpp",
- MAME_DIR .. "src/lib/formats/trs80_dsk.h",
- MAME_DIR .. "src/lib/formats/tvc_cas.cpp",
- MAME_DIR .. "src/lib/formats/tvc_cas.h",
- MAME_DIR .. "src/lib/formats/tvc_dsk.cpp",
- MAME_DIR .. "src/lib/formats/tvc_dsk.h",
- MAME_DIR .. "src/lib/formats/tzx_cas.cpp",
- MAME_DIR .. "src/lib/formats/tzx_cas.h",
- MAME_DIR .. "src/lib/formats/uef_cas.cpp",
- MAME_DIR .. "src/lib/formats/uef_cas.h",
- MAME_DIR .. "src/lib/formats/upd765_dsk.cpp",
- MAME_DIR .. "src/lib/formats/upd765_dsk.h",
- MAME_DIR .. "src/lib/formats/vdk_dsk.cpp",
- MAME_DIR .. "src/lib/formats/vdk_dsk.h",
- MAME_DIR .. "src/lib/formats/vector06_dsk.cpp",
- MAME_DIR .. "src/lib/formats/vector06_dsk.h",
- MAME_DIR .. "src/lib/formats/victor9k_dsk.cpp",
- MAME_DIR .. "src/lib/formats/victor9k_dsk.h",
- MAME_DIR .. "src/lib/formats/vg5k_cas.cpp",
- MAME_DIR .. "src/lib/formats/vg5k_cas.h",
- MAME_DIR .. "src/lib/formats/vt_cas.cpp",
- MAME_DIR .. "src/lib/formats/vt_cas.h",
+-- MAME_DIR .. "src/lib/formats/thom_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/thom_cas.h",
+-- MAME_DIR .. "src/lib/formats/thom_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/thom_dsk.h",
+-- MAME_DIR .. "src/lib/formats/ti99_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/ti99_dsk.h",
+-- MAME_DIR .. "src/lib/formats/tiki100_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/tiki100_dsk.h",
+-- MAME_DIR .. "src/lib/formats/trd_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/trd_dsk.h",
+-- MAME_DIR .. "src/lib/formats/trs_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/trs_cas.h",
+-- MAME_DIR .. "src/lib/formats/trs80_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/trs80_dsk.h",
+-- MAME_DIR .. "src/lib/formats/tvc_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/tvc_cas.h",
+-- MAME_DIR .. "src/lib/formats/tvc_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/tvc_dsk.h",
+-- MAME_DIR .. "src/lib/formats/tzx_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/tzx_cas.h",
+-- MAME_DIR .. "src/lib/formats/uef_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/uef_cas.h",
+-- MAME_DIR .. "src/lib/formats/upd765_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/upd765_dsk.h",
+-- MAME_DIR .. "src/lib/formats/vdk_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/vdk_dsk.h",
+-- MAME_DIR .. "src/lib/formats/vector06_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/vector06_dsk.h",
+-- MAME_DIR .. "src/lib/formats/victor9k_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/victor9k_dsk.h",
+-- MAME_DIR .. "src/lib/formats/vg5k_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/vg5k_cas.h",
+-- MAME_DIR .. "src/lib/formats/vt_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/vt_cas.h",
MAME_DIR .. "src/lib/formats/wavfile.cpp",
MAME_DIR .. "src/lib/formats/wavfile.h",
- MAME_DIR .. "src/lib/formats/wd177x_dsk.cpp",
- MAME_DIR .. "src/lib/formats/wd177x_dsk.h",
- MAME_DIR .. "src/lib/formats/x07_cas.cpp",
- MAME_DIR .. "src/lib/formats/x07_cas.h",
- MAME_DIR .. "src/lib/formats/x1_tap.cpp",
- MAME_DIR .. "src/lib/formats/x1_tap.h",
- MAME_DIR .. "src/lib/formats/xdf_dsk.cpp",
- MAME_DIR .. "src/lib/formats/xdf_dsk.h",
- MAME_DIR .. "src/lib/formats/zx81_p.cpp",
- MAME_DIR .. "src/lib/formats/zx81_p.h",
+-- MAME_DIR .. "src/lib/formats/wd177x_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/wd177x_dsk.h",
+-- MAME_DIR .. "src/lib/formats/x07_cas.cpp",
+-- MAME_DIR .. "src/lib/formats/x07_cas.h",
+-- MAME_DIR .. "src/lib/formats/x1_tap.cpp",
+-- MAME_DIR .. "src/lib/formats/x1_tap.h",
+-- MAME_DIR .. "src/lib/formats/xdf_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/xdf_dsk.h",
+-- MAME_DIR .. "src/lib/formats/zx81_p.cpp",
+-- MAME_DIR .. "src/lib/formats/zx81_p.h",
MAME_DIR .. "src/lib/formats/hxcmfm_dsk.cpp",
MAME_DIR .. "src/lib/formats/hxcmfm_dsk.h",
- MAME_DIR .. "src/lib/formats/itt3030_dsk.cpp",
- MAME_DIR .. "src/lib/formats/itt3030_dsk.h",
+-- MAME_DIR .. "src/lib/formats/itt3030_dsk.cpp",
+-- MAME_DIR .. "src/lib/formats/itt3030_dsk.h",
}
-- netlist now defines a project
diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua
index fbc923b3073..1eb90f5a81a 100644
--- a/docs/release/scripts/src/machine.lua
+++ b/docs/release/scripts/src/machine.lua
@@ -9,7 +9,54 @@
--
----------------------------------------------------------------------------
-
+files {
+ MAME_DIR .. "src/devices/machine/bcreader.cpp",
+ MAME_DIR .. "src/devices/machine/bcreader.h",
+-- MAME_DIR .. "src/devices/machine/buffer.cpp",
+-- MAME_DIR .. "src/devices/machine/buffer.h",
+-- MAME_DIR .. "src/devices/machine/clock.cpp",
+-- MAME_DIR .. "src/devices/machine/clock.h",
+-- MAME_DIR .. "src/devices/machine/keyboard.cpp",
+-- MAME_DIR .. "src/devices/machine/keyboard.h",
+ MAME_DIR .. "src/devices/machine/laserdsc.cpp",
+ MAME_DIR .. "src/devices/machine/laserdsc.h",
+-- MAME_DIR .. "src/devices/machine/latch.cpp",
+-- MAME_DIR .. "src/devices/machine/latch.h",
+ MAME_DIR .. "src/devices/machine/nvram.cpp",
+ MAME_DIR .. "src/devices/machine/nvram.h",
+ MAME_DIR .. "src/devices/machine/ram.cpp",
+ MAME_DIR .. "src/devices/machine/ram.h",
+ MAME_DIR .. "src/devices/machine/legscsi.cpp",
+ MAME_DIR .. "src/devices/machine/legscsi.h",
+-- MAME_DIR .. "src/devices/machine/terminal.cpp",
+-- MAME_DIR .. "src/devices/machine/terminal.h",
+}
+files {
+-- MAME_DIR .. "src/devices/imagedev/bitbngr.cpp",
+-- MAME_DIR .. "src/devices/imagedev/bitbngr.h",
+ MAME_DIR .. "src/devices/imagedev/cassette.cpp",
+ MAME_DIR .. "src/devices/imagedev/cassette.h",
+ MAME_DIR .. "src/devices/imagedev/chd_cd.cpp",
+ MAME_DIR .. "src/devices/imagedev/chd_cd.h",
+-- MAME_DIR .. "src/devices/imagedev/diablo.cpp",
+-- MAME_DIR .. "src/devices/imagedev/diablo.h",
+ MAME_DIR .. "src/devices/imagedev/flopdrv.cpp",
+ MAME_DIR .. "src/devices/imagedev/flopdrv.h",
+ MAME_DIR .. "src/devices/imagedev/floppy.cpp",
+ MAME_DIR .. "src/devices/imagedev/floppy.h",
+ MAME_DIR .. "src/devices/imagedev/harddriv.cpp",
+ MAME_DIR .. "src/devices/imagedev/harddriv.h",
+-- MAME_DIR .. "src/devices/imagedev/mfmhd.cpp",
+-- MAME_DIR .. "src/devices/imagedev/mfmhd.h",
+-- MAME_DIR .. "src/devices/imagedev/midiin.cpp",
+-- MAME_DIR .. "src/devices/imagedev/midiin.h",
+-- MAME_DIR .. "src/devices/imagedev/midiout.cpp",
+-- MAME_DIR .. "src/devices/imagedev/midiout.h",
+-- MAME_DIR .. "src/devices/imagedev/printer.cpp",
+-- MAME_DIR .. "src/devices/imagedev/printer.h",
+-- MAME_DIR .. "src/devices/imagedev/snapquik.cpp",
+-- MAME_DIR .. "src/devices/imagedev/snapquik.h",
+}
---------------------------------------------------
--
--@src/devices/machine/akiko.h,MACHINES["AKIKO"] = true
@@ -1709,6 +1756,8 @@ if (MACHINES["PCI"]~=null) then
MAME_DIR .. "src/devices/machine/lpc-pit.h",
MAME_DIR .. "src/devices/machine/vrc4373.cpp",
MAME_DIR .. "src/devices/machine/vrc4373.h",
+ MAME_DIR .. "src/devices/machine/gt64xxx.cpp",
+ MAME_DIR .. "src/devices/machine/gt64xxx.h",
}
end
@@ -2084,6 +2133,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/tmc0430.h,MACHINES["TMC0430"] = true
+---------------------------------------------------
+
+if (MACHINES["TMC0430"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/tmc0430.cpp",
+ MAME_DIR .. "src/devices/machine/tmc0430.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/tmp68301.h,MACHINES["TMP68301"] = true
---------------------------------------------------
@@ -2724,3 +2785,27 @@ if (MACHINES["PDC"]~=null) then
MAME_DIR .. "src/devices/machine/pdc.h",
}
end
+
+---------------------------------------------------
+--
+--@src/devices/machine/genpc.h,MACHINES["GENPC"] = true
+---------------------------------------------------
+
+if (MACHINES["GENPC"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/genpc.cpp",
+ MAME_DIR .. "src/devices/machine/genpc.h",
+ }
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/gen_latch.h,MACHINES["GEN_LATCH] = true
+---------------------------------------------------
+
+if (MACHINES["GEN_LATCH"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/gen_latch.cpp",
+ MAME_DIR .. "src/devices/machine/gen_latch.h",
+ }
+end
diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua
index b8125bf1989..56c93a996ee 100644
--- a/docs/release/scripts/src/main.lua
+++ b/docs/release/scripts/src/main.lua
@@ -10,7 +10,7 @@
---------------------------------------------------------------------------
function mainProject(_target, _subtarget)
-if (_OPTIONS["SOURCES"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
if (_target == _subtarget) then
project (_target)
else
@@ -19,17 +19,41 @@ if (_OPTIONS["SOURCES"] == nil) then
else
project (_target .. _subtarget)
end
- end
+ end
else
project (_subtarget)
-end
+end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
+ configuration { "android*" }
+ targetprefix "lib"
+ targetname "main"
+ targetextension ".so"
+ linkoptions {
+ "-shared",
+ "-Wl,-soname,libmain.so"
+ }
+ links {
+ "EGL",
+ "GLESv1_CM",
+ "GLESv2",
+ "SDL2",
+ }
+ configuration { "pnacl" }
+ kind "ConsoleApp"
+ targetextension ".pexe"
+ links {
+ "ppapi",
+ "ppapi_gles2",
+ "pthread",
+ }
+ configuration { }
+
addprojectflags()
flags {
"NoManifest",
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
if _OPTIONS["SYMBOLS"] then
@@ -39,7 +63,7 @@ end
"$(SILENT) objdump --section=.text --line-numbers --syms --demangle $(TARGET) >$(subst .exe,.sym,$(TARGET))"
}
end
-
+
configuration { "vs*" }
flags {
"Unicode",
@@ -84,33 +108,80 @@ end
configuration { "mingw*" or "vs*" }
targetextension ".exe"
+ configuration { "rpi" }
+ targetextension ""
+
configuration { "asmjs" }
- targetextension ".bc"
+ targetextension ".bc"
if os.getenv("EMSCRIPTEN") then
local emccopts = ""
emccopts = emccopts .. " -O3"
emccopts = emccopts .. " -s USE_SDL=2"
+ emccopts = emccopts .. " -s USE_SDL_TTF=2"
emccopts = emccopts .. " --memory-init-file 0"
emccopts = emccopts .. " -s ALLOW_MEMORY_GROWTH=0"
emccopts = emccopts .. " -s TOTAL_MEMORY=268435456"
emccopts = emccopts .. " -s DISABLE_EXCEPTION_CATCHING=2"
- emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]'"
- 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 .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\",\"__ZN12cli_frontend7executeEiPPc\"]'"
+ emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\""
emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js"
- emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js"
- emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx@bgfx"
- emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "shaders/gles@shaders/gles"
+ emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js"
+ emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains"
+ emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects"
+ emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles"
+ emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png"
postbuildcommands {
os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js",
}
end
configuration { }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
+
+if _OPTIONS["IGNORE_GIT"]~="1" then
+ GIT_VERSION = backtick( "git describe --dirty" )
+ local p = string.find(GIT_VERSION, '-', 1)
+ if (p~=nil) then
+ defines {
+ "GIT_VERSION=" .. string.sub(GIT_VERSION,p+1)
+ }
end
+end
+ if _OPTIONS["targetos"]=="android" then
+ includedirs {
+ MAME_DIR .. "3rdparty/SDL2/include",
+ }
+
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c",
+ }
+ targetsuffix ""
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["PLATFORM"]=="arm" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
+ end
+ if _OPTIONS["PLATFORM"]=="arm64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a")
+ end
+ if _OPTIONS["PLATFORM"]=="mips" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips")
+ end
+ if _OPTIONS["PLATFORM"]=="mips64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64")
+ end
+ if _OPTIONS["PLATFORM"]=="x86" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86")
+ end
+ if _OPTIONS["PLATFORM"]=="x64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
+ end
+ end
+ else
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
+ end
+
findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"])
links {
"osd_" .. _OPTIONS["osd"],
@@ -118,12 +189,8 @@ end
links {
"qtdbg_" .. _OPTIONS["osd"],
}
- if (_OPTIONS["SOURCES"] == nil) then
- links {
- "bus",
- }
- end
links {
+ "frontend",
"netlist",
"optional",
"emu",
@@ -136,59 +203,38 @@ if #disasm_files > 0 then
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"softfloat",
- "jpeg",
+ ext_lib("jpeg"),
"7z",
- "lua",
+ ext_lib("lua"),
"lualibs",
- "luv",
- "uv",
- "http-parser",
}
- if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
- else
- links {
- "z",
- }
- end
-
- if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
- else
- links {
- "FLAC",
- }
- end
-
- if _OPTIONS["with-bundled-sqlite3"] then
- links {
- "sqllite3",
- }
- else
+ if _OPTIONS["USE_LIBUV"]=="1" then
links {
- "sqlite3",
+ ext_lib("uv"),
+ "http-parser",
}
end
+ links {
+ ext_lib("zlib"),
+ ext_lib("flac"),
+ ext_lib("sqlite3"),
+ }
if _OPTIONS["NO_USE_MIDI"]~="1" then
links {
- "portmidi",
+ ext_lib("portmidi"),
}
end
links {
"bgfx",
"ocore_" .. _OPTIONS["osd"],
}
-
+
override_resources = false;
-
+
maintargetosdoptions(_target,_subtarget)
includedirs {
@@ -201,14 +247,10 @@ end
MAME_DIR .. "3rdparty",
GEN_DIR .. _target .. "/layout",
GEN_DIR .. "resource",
+ ext_includedir("zlib"),
+ ext_includedir("flac"),
}
- if _OPTIONS["with-bundled-zlib"] then
- includedirs {
- MAME_DIR .. "3rdparty/zlib",
- }
- end
-
if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
linkoptions {
"-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist"
@@ -224,10 +266,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,
@@ -238,12 +277,12 @@ 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 },
}
- end
+ end
end
local mainfile = MAME_DIR .. "src/".._target .."/" .. _subtarget ..".cpp"
@@ -255,45 +294,67 @@ end
MAME_DIR .. "src/version.cpp",
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp",
}
-
-if (_OPTIONS["SOURCES"] == nil) then
- dependency {
- { "../../../../generated/mame/mame/drivlist.cpp", MAME_DIR .. "src/mame/mess.lst", true },
- { "../../../../generated/mame/mame/drivlist.cpp" , MAME_DIR .. "src/mame/arcade.lst", true},
- }
- custombuildtask {
- { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }},
- }
-end
-if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then
- configuration { "gmake" }
+if (_OPTIONS["SOURCES"] == nil) then
+
+ if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then
+ dependency {
+ {
+ GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
+ }
+ custombuildtask {
+ { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }},
+ }
+ else
+ if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then
+ custombuildtask {
+ { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }},
+ }
+ else
+ dependency {
+ {
+ GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
+ }
+ custombuildtask {
+ { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }},
+ }
+ end
+ end
+end
+
+if (_OPTIONS["SOURCES"] ~= nil) then
dependency {
- { ".PHONY", ".FORCE", true },
- { "$(OBJDIR)/src/version.o", ".FORCE", true },
+ {
+ GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
+ }
+ custombuildtask {
+ { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }},
}
end
+
configuration { "mingw*" }
- custombuildtask {
+ custombuildtask {
{ MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }},
- }
-
+ }
+
configuration { "vs*" }
- prebuildcommands {
+ prebuildcommands {
"mkdir " .. path.translate(GEN_DIR .. "resource/","\\") .. " 2>NUL",
"@echo Emitting ".. rctarget .. "vers.rc...",
PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") ,
- }
-
- if (_OPTIONS["osd"] == "sdl") then
- configuration { "x64","vs*" }
- prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x64/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" }
- configuration { "x32","vs*" }
- prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x86/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" }
- end
-
+ }
+
configuration { }
- debugdir (MAME_DIR)
- debugargs ("-window")
+ if _OPTIONS["DEBUG_DIR"]~=nil then
+ debugabsolutedir(_OPTIONS["DEBUG_DIR"])
+ else
+ debugdir (MAME_DIR)
+ end
+ if _OPTIONS["DEBUG_ARGS"]~=nil then
+ debugargs (_OPTIONS["DEBUG_ARGS"])
+ else
+ debugargs ("-window")
+ end
+
end
diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua
new file mode 100644
index 00000000000..2e4a35bf8a9
--- /dev/null
+++ b/docs/release/scripts/src/mame/frontend.lua
@@ -0,0 +1,154 @@
+-- license:BSD-3-Clause
+-- copyright-holders:MAMEdev Team
+
+---------------------------------------------------------------------------
+--
+-- frontend.lua
+--
+-- Rules for building frontend
+--
+---------------------------------------------------------------------------
+
+project ("frontend")
+targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
+uuid ("e98e14c4-82a4-4988-ba29-01c90c817ab8")
+kind (LIBTYPE)
+
+addprojectflags()
+precompiledheaders()
+options {
+ "ArchiveSplit",
+}
+includedirs {
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/emu",
+ MAME_DIR .. "src/frontend/mame",
+ 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("expat"),
+ ext_includedir("lua"),
+ ext_includedir("zlib"),
+ ext_includedir("flac"),
+}
+
+if (_OPTIONS["targetos"] == "windows") then
+ defines {
+ "UI_WINDOWS",
+ }
+end
+
+if (_OPTIONS["osd"] == "sdl") then
+ defines {
+ "UI_SDL",
+ }
+end
+
+files {
+ MAME_DIR .. "src/frontend/mame/audit.cpp",
+ MAME_DIR .. "src/frontend/mame/audit.h",
+ MAME_DIR .. "src/frontend/mame/cheat.cpp",
+ MAME_DIR .. "src/frontend/mame/cheat.h",
+ MAME_DIR .. "src/frontend/mame/clifront.cpp",
+ MAME_DIR .. "src/frontend/mame/clifront.h",
+ MAME_DIR .. "src/frontend/mame/info.cpp",
+ MAME_DIR .. "src/frontend/mame/info.h",
+ MAME_DIR .. "src/frontend/mame/language.cpp",
+ MAME_DIR .. "src/frontend/mame/language.h",
+ MAME_DIR .. "src/frontend/mame/luaengine.cpp",
+ MAME_DIR .. "src/frontend/mame/luaengine.h",
+ MAME_DIR .. "src/frontend/mame/mame.cpp",
+ MAME_DIR .. "src/frontend/mame/mame.h",
+ MAME_DIR .. "src/frontend/mame/mameopts.cpp",
+ MAME_DIR .. "src/frontend/mame/mameopts.h",
+ MAME_DIR .. "src/frontend/mame/pluginopts.cpp",
+ MAME_DIR .. "src/frontend/mame/pluginopts.h",
+ MAME_DIR .. "src/frontend/mame/ui/ui.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/ui.h",
+ MAME_DIR .. "src/frontend/mame/ui/devctrl.h",
+ MAME_DIR .. "src/frontend/mame/ui/menu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/menu.h",
+ MAME_DIR .. "src/frontend/mame/ui/submenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/submenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/mainmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/mainmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/miscmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/barcode.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/barcode.h",
+ MAME_DIR .. "src/frontend/mame/ui/cheatopt.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/cheatopt.h",
+ MAME_DIR .. "src/frontend/mame/ui/pluginopt.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/pluginopt.h",
+ MAME_DIR .. "src/frontend/mame/ui/devopt.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/devopt.h",
+ MAME_DIR .. "src/frontend/mame/ui/filemngr.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/filemngr.h",
+ MAME_DIR .. "src/frontend/mame/ui/filesel.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/filesel.h",
+ MAME_DIR .. "src/frontend/mame/ui/floppycntrl.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/floppycntrl.h",
+ MAME_DIR .. "src/frontend/mame/ui/imgcntrl.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/imgcntrl.h",
+ MAME_DIR .. "src/frontend/mame/ui/info.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/info.h",
+ MAME_DIR .. "src/frontend/mame/ui/info_pty.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/info_pty.h",
+ MAME_DIR .. "src/frontend/mame/ui/inputmap.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/inputmap.h",
+ MAME_DIR .. "src/frontend/mame/ui/sliders.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/sliders.h",
+ MAME_DIR .. "src/frontend/mame/ui/slotopt.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/slotopt.h",
+ MAME_DIR .. "src/frontend/mame/ui/swlist.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/swlist.h",
+ MAME_DIR .. "src/frontend/mame/ui/tapectrl.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/tapectrl.h",
+ MAME_DIR .. "src/frontend/mame/ui/videoopt.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/videoopt.h",
+ MAME_DIR .. "src/frontend/mame/ui/viewgfx.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/viewgfx.h",
+ MAME_DIR .. "src/frontend/mame/ui/auditmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/auditmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/custmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/custmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/custui.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/custui.h",
+ MAME_DIR .. "src/frontend/mame/ui/datfile.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/datfile.h",
+ MAME_DIR .. "src/frontend/mame/ui/datmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/datmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/defimg.h",
+ MAME_DIR .. "src/frontend/mame/ui/dirmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/dirmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/icorender.h",
+ MAME_DIR .. "src/frontend/mame/ui/inifile.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/inifile.h",
+ MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/miscmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/moptions.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/moptions.h",
+ MAME_DIR .. "src/frontend/mame/ui/optsmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/optsmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/selector.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/selector.h",
+ MAME_DIR .. "src/frontend/mame/ui/selgame.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/selgame.h",
+ MAME_DIR .. "src/frontend/mame/ui/simpleselgame.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/simpleselgame.h",
+ MAME_DIR .. "src/frontend/mame/ui/selsoft.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/selsoft.h",
+ MAME_DIR .. "src/frontend/mame/ui/sndmenu.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/sndmenu.h",
+ MAME_DIR .. "src/frontend/mame/ui/starimg.h",
+ MAME_DIR .. "src/frontend/mame/ui/toolbar.h",
+ MAME_DIR .. "src/frontend/mame/ui/utils.cpp",
+ MAME_DIR .. "src/frontend/mame/ui/utils.h",
+}
diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua
index 7b2dff521a5..cb389db8d8d 100644
--- a/docs/release/scripts/src/netlist.lua
+++ b/docs/release/scripts/src/netlist.lua
@@ -19,13 +19,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist",
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
+ -- ext_includedir("expat"),
}
- -- if _OPTIONS["with-bundled-expat"] then
- -- includedirs {
- -- MAME_DIR .. "3rdparty/expat/lib",
- -- }
- --end
-
files {
MAME_DIR .. "src/lib/netlist/nl_config.h",
@@ -47,6 +42,8 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
MAME_DIR .. "src/lib/netlist/plib/plists.h",
+ MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp",
+ MAME_DIR .. "src/lib/netlist/plib/pdynlib.h",
MAME_DIR .. "src/lib/netlist/plib/poptions.h",
MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
MAME_DIR .. "src/lib/netlist/plib/pparser.h",
@@ -73,6 +70,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.h",
+ MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h",
@@ -80,14 +78,14 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h",
MAME_DIR .. "src/lib/netlist/solver/mat_cr.h",
+ MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h",
+ MAME_DIR .. "src/lib/netlist/solver/nld_ms_w.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h",
- MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
+ MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_4066.h",
- MAME_DIR .. "src/lib/netlist/devices/nld_7400.cpp",
- MAME_DIR .. "src/lib/netlist/devices/nld_7400.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7402.cpp",
MAME_DIR .. "src/lib/netlist/devices/nld_7402.h",
MAME_DIR .. "src/lib/netlist/devices/nld_7404.cpp",
@@ -173,5 +171,5 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp",
MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h",
MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp",
- MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
+ MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
}
diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua
index 1dfa4317a48..fef235457fe 100644
--- a/docs/release/scripts/src/osd/modules.lua
+++ b/docs/release/scripts/src/osd/modules.lua
@@ -10,7 +10,7 @@
---------------------------------------------------------------------------
function string.starts(String,Start)
- return string.sub(String,1,string.len(Start))==Start
+ return string.sub(String,1,string.len(Start))==Start
end
function addlibfromstring(str)
@@ -44,18 +44,25 @@ function osdmodulesbuild()
files {
MAME_DIR .. "src/osd/osdnet.cpp",
MAME_DIR .. "src/osd/osdnet.h",
+ MAME_DIR .. "src/osd/watchdog.cpp",
+ MAME_DIR .. "src/osd/watchdog.h",
MAME_DIR .. "src/osd/modules/debugger/debug_module.h",
MAME_DIR .. "src/osd/modules/font/font_module.h",
MAME_DIR .. "src/osd/modules/midi/midi_module.h",
MAME_DIR .. "src/osd/modules/netdev/netdev_module.h",
MAME_DIR .. "src/osd/modules/sound/sound_module.h",
+ MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_module.h",
MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
MAME_DIR .. "src/osd/modules/lib/osdobj_common.h",
+ MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
+ MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp",
MAME_DIR .. "src/osd/modules/debugger/none.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
+ MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp",
MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
MAME_DIR .. "src/osd/modules/font/font_none.cpp",
MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
@@ -69,12 +76,58 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/none.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_module.h",
+ 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",
+ MAME_DIR .. "src/osd/modules/input/input_sdl.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_sdlcommon.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_sdlcommon.h",
+ MAME_DIR .. "src/osd/modules/input/input_x11.cpp",
+ 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"),
}
+ includedirs {
+ MAME_DIR .. "src/frontend/mame", -- for internal debugger
+ }
if _OPTIONS["targetos"]=="windows" then
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",
+ MAME_DIR .. "3rdparty/compat/mingw",
}
+
+ if _OPTIONS["MODERN_WIN_API"]~="1" then
+ includedirs {
+ MAME_DIR .. "3rdparty/compat/winsdk-override",
+ }
+ end
end
if _OPTIONS["NO_OPENGL"]=="1" then
@@ -100,36 +153,65 @@ function osdmodulesbuild()
end
end
+ defines {
+ "__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/aviwrite.cpp",
+ MAME_DIR .. "src/osd/modules/render/aviwrite.h",
+ 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",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/clear.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/clear.h",
+ MAME_DIR .. "src/osd/modules/render/bgfx/clearreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/clearreader.h",
MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/entryuniformreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/frameparameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/timeparameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramuniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramuniformreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/parameter.cpp",
- MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slideruniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slideruniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/suppressor.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/suppressorreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/targetreader.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp",
MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/valueuniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/valueuniformreader.cpp",
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",
}
@@ -138,6 +220,10 @@ function osdmodulesbuild()
defines {
"NO_USE_MIDI",
}
+ else
+ includedirs {
+ ext_includedir("portmidi"),
+ }
end
if _OPTIONS["USE_QTDEBUG"]=="1" then
@@ -158,7 +244,7 @@ function qtdebuggerbuild()
removeflags {
"SingleOutputDir",
}
- local version = str_to_version(_OPTIONS["gcc_version"])
+ local version = str_to_version(_OPTIONS["gcc_version"])
if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then
configuration { "gmake" }
if (version >= 30600) then
@@ -232,14 +318,14 @@ function qtdebuggerbuild()
custombuildtask {
- { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
- { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+ { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
}
@@ -349,6 +435,7 @@ function osdmodulestargetconf()
"gdi32",
"dsound",
"dxguid",
+ "oleaut32",
}
elseif _OPTIONS["targetos"]=="macosx" then
links {
@@ -399,7 +486,7 @@ newoption {
}
if not _OPTIONS["NO_USE_MIDI"] then
- if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -416,29 +503,6 @@ newoption {
}
newoption {
- trigger = "USE_XAUDIO2",
- description = "Use XAudio2 API for audio",
- allowed = {
- { "0", "Disable XAudio2" },
- { "1", "Enable XAudio2" },
- },
-}
-
-if _OPTIONS["USE_XAUDIO2"]=="1" then
- _OPTIONS["MODERN_WIN_API"] = "1",
- defines {
- "USE_XAUDIO2=1",
- },
- includedirs {
- MAME_DIR .. "3rdparty/win81sdk/Include/um",
- }
-else
- defines {
- "USE_XAUDIO2=0",
- }
-end
-
-newoption {
trigger = "USE_QTDEBUG",
description = "Use QT debugger",
allowed = {
@@ -454,7 +518,7 @@ newoption {
if not _OPTIONS["USE_QTDEBUG"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua
index c8451ed90a9..a5527ef4b0d 100644
--- a/docs/release/scripts/src/osd/newui.lua
+++ b/docs/release/scripts/src/osd/newui.lua
@@ -1,3 +1,14 @@
+-- license:BSD-3-Clause
+-- copyright-holders:Robbbert
+
+---------------------------------------------------------------------------
+--
+-- newui.lua
+--
+-- Rules for the building for Windows
+--
+---------------------------------------------------------------------------
+
dofile("modules.lua")
premake.make.linkoptions_after = false;
@@ -26,10 +37,12 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
-- needs same resources as messui, because dropdown menus are in mameui.rc
override_resources = true;
+ rctarget = _subtarget;
local rcfile = MAME_DIR .. "src/osd/winui/" .. _subtarget .. ".rc"
local uifile = MAME_DIR .. "src/osd/winui/" .. _subtarget .. "ui.rc"
@@ -109,6 +122,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/osd/modules/render",
MAME_DIR .. "3rdparty",
}
@@ -118,32 +132,55 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
+ MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawd3d.h",
MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawgdi.h",
MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
- MAME_DIR .. "src/osd/windows/input.cpp",
- MAME_DIR .. "src/osd/windows/output.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawnone.h",
MAME_DIR .. "src/osd/windows/video.cpp",
+ MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
+ MAME_DIR .. "src/osd/windows/window.h",
MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
+ MAME_DIR .. "src/osd/windows/winmain.cpp",
+ MAME_DIR .. "src/osd/windows/winmain.h",
+ MAME_DIR .. "src/osd/osdepend.h",
MAME_DIR .. "src/osd/winui/newui.cpp",
MAME_DIR .. "src/osd/windows/winmain.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h",
}
@@ -161,8 +198,10 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_cfg.lua")
includedirs {
+ MAME_DIR .. "3rdparty",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
@@ -177,30 +216,33 @@ project ("ocore_" .. _OPTIONS["osd"])
}
files {
+ MAME_DIR .. "src/osd/eigccppc.h",
+ MAME_DIR .. "src/osd/eigccx86.h",
+ MAME_DIR .. "src/osd/eivc.h",
+ MAME_DIR .. "src/osd/eivcx86.h",
+ MAME_DIR .. "src/osd/eminline.h",
+ MAME_DIR .. "src/osd/osdcomm.h",
MAME_DIR .. "src/osd/osdcore.cpp",
+ MAME_DIR .. "src/osd/osdcore.h",
MAME_DIR .. "src/osd/strconv.cpp",
+ MAME_DIR .. "src/osd/strconv.h",
MAME_DIR .. "src/osd/windows/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
- MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+ MAME_DIR .. "src/osd/osdsync.cpp",
+ MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
+ MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
- MAME_DIR .. "src/osd/windows/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winptty.cpp",
+ MAME_DIR .. "src/osd/windows/winutil.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+ MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ MAME_DIR .. "src/osd/modules/file/winfile.h",
+ MAME_DIR .. "src/osd/modules/file/winptty.cpp",
+ MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
}
- if _OPTIONS["NOASM"]=="1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
- files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
- }
- end
--------------------------------------------------
diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua
index 76947ad777a..d1a83229698 100644
--- a/docs/release/scripts/src/osd/sdl.lua
+++ b/docs/release/scripts/src/osd/sdl.lua
@@ -38,7 +38,7 @@ function maintargetosdoptions(_target,_subtarget)
}
end
- if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then
+ if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" then
links {
"SDL2_ttf",
}
@@ -48,35 +48,53 @@ function maintargetosdoptions(_target,_subtarget)
end
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
configuration { "mingw*"}
links {
- "SDL2.dll",
- }
- configuration { "x64","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x64",
- }
- configuration { "x32","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x86",
+ "SDL2",
+ "Imm32",
+ "Version",
+ "Ole32",
+ "OleAut32",
}
-
- configuration { "vs*"}
+ configuration { "vs*" }
links {
"SDL2",
+ "Imm32",
+ "Version",
}
configuration { }
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ 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
+ configuration { "x32", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
+ }
+ configuration { "x64", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
+ }
end
links {
"psapi",
}
-
- configuration { "mingw*-gcc" }
+ configuration { "mingw*" }
linkoptions{
"-municode",
}
@@ -84,14 +102,6 @@ function maintargetosdoptions(_target,_subtarget)
flags {
"Unicode",
}
- configuration { "x32", "vs*" }
- libdirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
- }
- configuration { "x64", "vs*" }
- libdirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
- }
configuration {}
elseif _OPTIONS["targetos"]=="haiku" then
links {
@@ -105,8 +115,16 @@ function maintargetosdoptions(_target,_subtarget)
links {
"psapi"
}
-
configuration { }
+
+ if _OPTIONS["targetos"]=="macosx" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ links {
+ "SDL2",
+ }
+ end
+ end
+
end
@@ -127,8 +145,8 @@ newoption {
}
newoption {
- trigger = "SDL_INI_PATH",
- description = "Default search path for .ini files",
+ trigger = "SDL_INI_PATH",
+ description = "Default search path for .ini files",
}
newoption {
@@ -141,7 +159,7 @@ newoption {
}
if not _OPTIONS["NO_X11"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
_OPTIONS["NO_X11"] = "1"
else
_OPTIONS["NO_X11"] = "0"
@@ -204,34 +222,28 @@ end
BASE_TARGETOS = "unix"
SDLOS_TARGETOS = "unix"
-SYNC_IMPLEMENTATION = "tc"
SDL_NETWORK = ""
if _OPTIONS["targetos"]=="linux" then
SDL_NETWORK = "taptun"
elseif _OPTIONS["targetos"]=="openbsd" then
- SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="netbsd" then
- SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="haiku" then
- SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="asmjs" then
- SYNC_IMPLEMENTATION = "mini"
elseif _OPTIONS["targetos"]=="windows" then
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
- SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
-elseif _OPTIONS["targetos"]=="os2" then
- BASE_TARGETOS = "os2"
- SDLOS_TARGETOS = "os2"
- SYNC_IMPLEMENTATION = "os2"
end
+if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then
+ includedirs {
+ GEN_DIR .. "includes",
+ }
+end
if BASE_TARGETOS=="unix" then
if _OPTIONS["targetos"]=="macosx" then
local os_version = str_to_version(backtick("sw_vers -productVersion"))
@@ -243,22 +255,35 @@ if BASE_TARGETOS=="unix" then
"-framework QuartzCore",
"-framework OpenGL",
}
+
+
if os_version>=101100 then
linkoptions {
"-weak_framework Metal",
}
end
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
linkoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- links {
- "SDL2.framework",
+ "-framework AudioUnit",
+ "-framework CoreAudio",
+ "-framework Carbon",
+ "-framework ForceFeedback",
+ "-framework IOKit",
+ "-framework CoreVideo",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ linkoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ links {
+ "SDL2.framework",
+ }
+ else
+ local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
end
else
if _OPTIONS["NO_X11"]=="1" then
@@ -270,10 +295,17 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- if _OPTIONS["targetos"]~="haiku" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then
+ links {
+ "SDL2",
+ }
+ else
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
+
+ if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then
links {
"m",
"pthread",
@@ -290,13 +322,6 @@ if BASE_TARGETOS=="unix" then
end
end
end
-elseif BASE_TARGETOS=="os2" then
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- links {
- "pthread"
- }
end
project ("qtdbg_" .. _OPTIONS["osd"])
@@ -335,6 +360,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/osd/modules/render",
MAME_DIR .. "3rdparty",
MAME_DIR .. "src/osd/sdl",
@@ -342,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
@@ -393,17 +419,12 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/sdlprefix.h",
MAME_DIR .. "src/osd/sdl/sdlmain.cpp",
MAME_DIR .. "src/osd/osdepend.h",
- MAME_DIR .. "src/osd/sdl/input.cpp",
- MAME_DIR .. "src/osd/sdl/input.h",
MAME_DIR .. "src/osd/sdl/video.cpp",
MAME_DIR .. "src/osd/sdl/video.h",
MAME_DIR .. "src/osd/sdl/window.cpp",
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",
}
files {
@@ -436,153 +457,37 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/osdcore.h",
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
+ MAME_DIR .. "src/osd/osdsync.cpp",
+ MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/sdl/sdldir.cpp",
- MAME_DIR .. "src/osd/sdl/sdlfile.cpp",
- MAME_DIR .. "src/osd/sdl/sdlfile.h",
- MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp",
- MAME_DIR .. "src/osd/sdl/sdlsocket.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",
MAME_DIR .. "src/osd/modules/lib/osdlib.h",
- MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".cpp",
- MAME_DIR .. "src/osd/modules/sync/osdsync.h",
}
- if _OPTIONS["NOASM"]=="1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
+ if BASE_TARGETOS=="unix" then
files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
+ MAME_DIR .. "src/osd/modules/file/posixfile.cpp",
+ MAME_DIR .. "src/osd/modules/file/posixfile.h",
+ MAME_DIR .. "src/osd/modules/file/posixptty.cpp",
+ MAME_DIR .. "src/osd/modules/file/posixsocket.cpp",
}
- 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")
-
+ elseif BASE_TARGETOS=="win32" then
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"],
+ MAME_DIR .. "src/osd/windows",
}
-
files {
- MAME_DIR .. "src/osd/sdl/testkeys.cpp",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ MAME_DIR .. "src/osd/modules/file/winfile.h",
+ MAME_DIR .. "src/osd/modules/file/winptty.cpp",
+ MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
+ MAME_DIR .. "src/osd/windows/winutil.cpp", -- FIXME put the necessary functions somewhere more appropriate
}
-
- if _OPTIONS["targetos"] == "windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2.dll",
- }
- configuration { "x64","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x64",
- }
- configuration { "x32","vs*" }
- libdirs {
- MAME_DIR .. "3rdparty/sdl2/lib/x86",
- }
- configuration { "vs*"}
- links {
- "SDL2",
- }
- 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",
- }
-
+ else
files {
- MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
+ MAME_DIR .. "src/osd/modules/file/stdfile.cpp",
}
+ end
+
- strip()
-end
diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua
index e3a6f913e75..0fd15e5ca27 100644
--- a/docs/release/scripts/src/osd/sdl_cfg.lua
+++ b/docs/release/scripts/src/osd/sdl_cfg.lua
@@ -19,9 +19,9 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[
end
if _OPTIONS["SDL_INI_PATH"]~=nil then
- defines {
- "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
- }
+ defines {
+ "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
+ }
end
if _OPTIONS["NO_X11"]=="1" then
@@ -67,7 +67,6 @@ end
defines {
"OSD_SDL",
- "SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION,
}
if BASE_TARGETOS=="unix" then
@@ -75,18 +74,20 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- buildoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- else
- defines {
- "MACOSX_USE_LIBSDL",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
- }
- end
+ if _OPTIONS["with-bundled-sdl2"]==nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ buildoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ else
+ defines {
+ "MACOSX_USE_LIBSDL",
+ }
+ buildoptions {
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ }
+ end
+ end
else
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
@@ -100,7 +101,7 @@ if BASE_TARGETOS=="unix" then
end
if _OPTIONS["targetos"]=="windows" then
- configuration { "mingw*-gcc or vs*" }
+ configuration { "mingw* or vs*" }
defines {
"UNICODE",
"_UNICODE",
@@ -111,10 +112,6 @@ if _OPTIONS["targetos"]=="windows" then
defines {
"MALLOC_DEBUG",
}
- configuration { "vs*" }
- includedirs {
- MAME_DIR .. "3rdparty/sdl2/include",
- }
configuration { }
elseif _OPTIONS["targetos"]=="linux" then
@@ -137,13 +134,6 @@ elseif _OPTIONS["targetos"]=="freebsd" then
-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
"-isystem /usr/local/include",
}
-elseif _OPTIONS["targetos"]=="os2" then
- defines {
- "SDLMAME_OS2",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
- }
end
configuration { "osx*" }
diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua
index 154d4732bc1..b4be2dc7ce4 100644
--- a/docs/release/scripts/src/osd/windows.lua
+++ b/docs/release/scripts/src/osd/windows.lua
@@ -15,7 +15,7 @@ dofile("modules.lua")
function maintargetosdoptions(_target,_subtarget)
osdmodulestargetconf()
- configuration { "mingw*-gcc" }
+ configuration { "mingw*" }
linkoptions {
"-municode",
}
@@ -46,6 +46,7 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
end
@@ -143,6 +144,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/osd/modules/render",
MAME_DIR .. "3rdparty",
}
@@ -163,10 +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/input.cpp",
- MAME_DIR .. "src/osd/windows/input.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",
@@ -218,15 +216,16 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_cfg.lua")
includedirs {
+ MAME_DIR .. "3rdparty",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
includedirs {
MAME_DIR .. "src/osd/windows",
@@ -244,61 +243,19 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/osdcore.h",
MAME_DIR .. "src/osd/strconv.cpp",
MAME_DIR .. "src/osd/strconv.h",
+ MAME_DIR .. "src/osd/osdsync.cpp",
+ MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
- MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
- MAME_DIR .. "src/osd/modules/sync/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
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/winfile.h",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
- MAME_DIR .. "src/osd/windows/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winptty.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ MAME_DIR .. "src/osd/modules/file/winfile.h",
+ MAME_DIR .. "src/osd/modules/file/winptty.cpp",
+ MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
}
-
- if _OPTIONS["NOASM"] == "1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
- files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
- }
- end
-
-
---------------------------------------------------
--- 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/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua
index 3e656017816..b7636e5b435 100644
--- a/docs/release/scripts/src/osd/windows_cfg.lua
+++ b/docs/release/scripts/src/osd/windows_cfg.lua
@@ -5,7 +5,7 @@ defines {
"OSD_WINDOWS",
}
-configuration { "mingw*-gcc or vs*" }
+configuration { "mingw* or vs*" }
defines {
"UNICODE",
"_UNICODE",
diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua
index cff0beea684..263e4f42a74 100644
--- a/docs/release/scripts/src/osd/winui.lua
+++ b/docs/release/scripts/src/osd/winui.lua
@@ -1,3 +1,14 @@
+-- license:BSD-3-Clause
+-- copyright-holders:Robbbert
+
+---------------------------------------------------------------------------
+--
+-- winui.lua
+--
+-- Rules for the building for Windows
+--
+---------------------------------------------------------------------------
+
dofile("modules.lua")
premake.make.linkoptions_after = false;
@@ -48,11 +59,13 @@ function maintargetosdoptions(_target,_subtarget)
"comctl32",
"comdlg32",
"psapi",
+ "ole32",
}
-- Local file gives correct icon in mame instance inside of mameui
-- Local file must #include mameui.rc
override_resources = true;
+ rctarget = _target;
local rcfile = MAME_DIR .. "src/osd/winui/" .. _target .. ".rc"
local uifile = MAME_DIR .. "src/osd/winui/" .. _target .. "ui.rc"
@@ -132,6 +145,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/osd/modules/render",
MAME_DIR .. "3rdparty",
}
@@ -141,60 +155,84 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
+ MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawd3d.h",
MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawgdi.h",
MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
- MAME_DIR .. "src/osd/windows/input.cpp",
- MAME_DIR .. "src/osd/windows/output.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawnone.h",
MAME_DIR .. "src/osd/windows/video.cpp",
+ MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
+ MAME_DIR .. "src/osd/windows/window.h",
MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
+ MAME_DIR .. "src/osd/windows/winmain.cpp",
+ MAME_DIR .. "src/osd/windows/winmain.h",
+ MAME_DIR .. "src/osd/osdepend.h",
-- MAME_DIR .. "src/osd/windows/winmenu.cpp",
MAME_DIR .. "src/osd/winui/newui.cpp",
MAME_DIR .. "src/osd/windows/winmain.cpp",
MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h",
MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp",
- MAME_DIR .. "src/osd/winui/win_options.cpp",
- MAME_DIR .. "src/osd/winui/mui_util.cpp",
- MAME_DIR .. "src/osd/winui/directinput.cpp",
+ MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h",
+ MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h",
+ MAME_DIR .. "src/osd/winui/bitmask.cpp",
+ MAME_DIR .. "src/osd/winui/columnedit.cpp",
+ MAME_DIR .. "src/osd/winui/datafile.cpp",
+ MAME_DIR .. "src/osd/winui/datamap.cpp",
+ MAME_DIR .. "src/osd/winui/dialogs.cpp",
MAME_DIR .. "src/osd/winui/dijoystick.cpp",
MAME_DIR .. "src/osd/winui/directdraw.cpp",
+ MAME_DIR .. "src/osd/winui/directinput.cpp",
MAME_DIR .. "src/osd/winui/directories.cpp",
- MAME_DIR .. "src/osd/winui/mui_audit.cpp",
- MAME_DIR .. "src/osd/winui/columnedit.cpp",
- MAME_DIR .. "src/osd/winui/screenshot.cpp",
- MAME_DIR .. "src/osd/winui/treeview.cpp",
- MAME_DIR .. "src/osd/winui/splitters.cpp",
- MAME_DIR .. "src/osd/winui/bitmask.cpp",
- MAME_DIR .. "src/osd/winui/datamap.cpp",
+ MAME_DIR .. "src/osd/winui/dirwatch.cpp",
MAME_DIR .. "src/osd/winui/dxdecode.cpp",
- MAME_DIR .. "src/osd/winui/picker.cpp",
- MAME_DIR .. "src/osd/winui/properties.cpp",
- MAME_DIR .. "src/osd/winui/tabview.cpp",
MAME_DIR .. "src/osd/winui/help.cpp",
+ MAME_DIR .. "src/osd/winui/helpids.cpp",
MAME_DIR .. "src/osd/winui/history.cpp",
- MAME_DIR .. "src/osd/winui/dialogs.cpp",
- MAME_DIR .. "src/osd/winui/mui_opts.cpp",
MAME_DIR .. "src/osd/winui/layout.cpp",
- MAME_DIR .. "src/osd/winui/datafile.cpp",
- MAME_DIR .. "src/osd/winui/dirwatch.cpp",
- MAME_DIR .. "src/osd/winui/winui.cpp",
- MAME_DIR .. "src/osd/winui/helpids.cpp",
+ MAME_DIR .. "src/osd/winui/mui_audit.cpp",
MAME_DIR .. "src/osd/winui/mui_main.cpp",
+ MAME_DIR .. "src/osd/winui/mui_opts.cpp",
+ MAME_DIR .. "src/osd/winui/mui_util.cpp",
+ MAME_DIR .. "src/osd/winui/picker.cpp",
+ MAME_DIR .. "src/osd/winui/properties.cpp",
+ MAME_DIR .. "src/osd/winui/resource.h",
+ MAME_DIR .. "src/osd/winui/screenshot.cpp",
+ MAME_DIR .. "src/osd/winui/splitters.cpp",
+ MAME_DIR .. "src/osd/winui/tabview.cpp",
+ MAME_DIR .. "src/osd/winui/treeview.cpp",
+ MAME_DIR .. "src/osd/winui/winui.cpp",
+ MAME_DIR .. "src/osd/winui/win_options.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
@@ -211,8 +249,10 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_cfg.lua")
includedirs {
+ MAME_DIR .. "3rdparty",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/osd/modules/file",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
@@ -227,18 +267,30 @@ project ("ocore_" .. _OPTIONS["osd"])
}
files {
+ MAME_DIR .. "src/osd/eigccppc.h",
+ MAME_DIR .. "src/osd/eigccx86.h",
+ MAME_DIR .. "src/osd/eivc.h",
+ MAME_DIR .. "src/osd/eivcx86.h",
+ MAME_DIR .. "src/osd/eminline.h",
+ MAME_DIR .. "src/osd/osdcomm.h",
MAME_DIR .. "src/osd/osdcore.cpp",
+ MAME_DIR .. "src/osd/osdcore.h",
MAME_DIR .. "src/osd/strconv.cpp",
+ MAME_DIR .. "src/osd/strconv.h",
+ MAME_DIR .. "src/osd/windows/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
- MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+ MAME_DIR .. "src/osd/osdsync.cpp",
+ MAME_DIR .. "src/osd/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
+ MAME_DIR .. "src/osd/windows/winutf8.h",
MAME_DIR .. "src/osd/windows/winutil.cpp",
- MAME_DIR .. "src/osd/windows/winclip.cpp",
- MAME_DIR .. "src/osd/windows/winsocket.cpp",
- MAME_DIR .. "src/osd/windows/winptty.cpp",
+ MAME_DIR .. "src/osd/windows/winutil.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
+ MAME_DIR .. "src/osd/modules/osdmodule.h",
+ MAME_DIR .. "src/osd/modules/file/winfile.cpp",
+ MAME_DIR .. "src/osd/modules/file/winfile.h",
+ MAME_DIR .. "src/osd/modules/file/winptty.cpp",
+ MAME_DIR .. "src/osd/modules/file/winsocket.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
}
@@ -252,11 +304,9 @@ if _OPTIONS["with-tools"] then
uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0")
kind "ConsoleApp"
- options {
- "ForceCPP",
- }
-
- targetdir(MAME_DIR)
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
links {
"ocore_" .. _OPTIONS["osd"],
diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua
index 6fd7e6398d7..17f9c6aa2b2 100644
--- a/docs/release/scripts/src/sound.lua
+++ b/docs/release/scripts/src/sound.lua
@@ -9,6 +9,14 @@
--
----------------------------------------------------------------------------
+files {
+ MAME_DIR .. "src/devices/sound/flt_vol.cpp",
+ MAME_DIR .. "src/devices/sound/flt_vol.h",
+ MAME_DIR .. "src/devices/sound/flt_rc.cpp",
+ MAME_DIR .. "src/devices/sound/flt_rc.h",
+ MAME_DIR .. "src/devices/sound/samples.cpp",
+ MAME_DIR .. "src/devices/sound/samples.h",
+}
---------------------------------------------------
-- DACs
@@ -81,7 +89,7 @@ if (SOUNDS["DISCRETE"]~=null) then
MAME_DIR .. "src/devices/sound/disc_mth.inc",
MAME_DIR .. "src/devices/sound/disc_sys.inc",
MAME_DIR .. "src/devices/sound/disc_wav.h",
- MAME_DIR .. "src/devices/sound/disc_wav.inc",
+ MAME_DIR .. "src/devices/sound/disc_wav.inc",
}
end
@@ -135,8 +143,8 @@ end
if (SOUNDS["TIA"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/tiasound.cpp",
- MAME_DIR .. "src/devices/sound/tiasound.h",
+ MAME_DIR .. "src/devices/sound/tiasound.cpp",
+ MAME_DIR .. "src/devices/sound/tiasound.h",
MAME_DIR .. "src/devices/sound/tiaintf.cpp",
MAME_DIR .. "src/devices/sound/tiaintf.h",
}
@@ -483,7 +491,7 @@ end
---------------------------------------------------
--- L7A1045 L6028 DSP-A
+-- L7A1045 L6028 DSP-A
--@src/devices/sound/l7a1045_l6028_dsp_a.h,SOUNDS["L7A1045"] = true
---------------------------------------------------
@@ -730,8 +738,8 @@ end
if (SOUNDS["QSOUND"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/qsound.cpp",
- MAME_DIR .. "src/devices/sound/qsound.h",
+ MAME_DIR .. "src/devices/sound/qsound.cpp",
+ MAME_DIR .. "src/devices/sound/qsound.h",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp",
@@ -1154,8 +1162,8 @@ if (SOUNDS["YM2413"]~=null) then
}
end
-if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
---if (SOUNDS["YM2203"]~=null) then
+if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
+--if (SOUNDS["YM2203"]~=null) then
files {
MAME_DIR .. "src/devices/sound/2203intf.cpp",
MAME_DIR .. "src/devices/sound/2203intf.h",
@@ -1169,12 +1177,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
--if (SOUNDS["YM2608"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2608intf.cpp",
- MAME_DIR .. "src/devices/sound/2608intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
+ MAME_DIR .. "src/devices/sound/2608intf.cpp",
+ MAME_DIR .. "src/devices/sound/2608intf.h",
+ MAME_DIR .. "src/devices/sound/ay8910.cpp",
+ MAME_DIR .. "src/devices/sound/ay8910.h",
+ MAME_DIR .. "src/devices/sound/fm.cpp",
+ MAME_DIR .. "src/devices/sound/fm.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1182,12 +1190,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
--if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2610intf.cpp",
- MAME_DIR .. "src/devices/sound/2610intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
+ MAME_DIR .. "src/devices/sound/2610intf.cpp",
+ MAME_DIR .. "src/devices/sound/2610intf.h",
+ MAME_DIR .. "src/devices/sound/ay8910.cpp",
+ MAME_DIR .. "src/devices/sound/ay8910.h",
+ MAME_DIR .. "src/devices/sound/fm.cpp",
+ MAME_DIR .. "src/devices/sound/fm.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1195,10 +1203,10 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
--if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2612intf.cpp",
- MAME_DIR .. "src/devices/sound/2612intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
+ MAME_DIR .. "src/devices/sound/2612intf.cpp",
+ MAME_DIR .. "src/devices/sound/2612intf.h",
+ MAME_DIR .. "src/devices/sound/ay8910.cpp",
+ MAME_DIR .. "src/devices/sound/ay8910.h",
MAME_DIR .. "src/devices/sound/fm2612.cpp",
}
--end
@@ -1207,10 +1215,10 @@ end
if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then
--if (SOUNDS["YM3812"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/3812intf.cpp",
- MAME_DIR .. "src/devices/sound/3812intf.h",
- MAME_DIR .. "src/devices/sound/fmopl.cpp",
- MAME_DIR .. "src/devices/sound/fmopl.h",
+ MAME_DIR .. "src/devices/sound/3812intf.cpp",
+ MAME_DIR .. "src/devices/sound/3812intf.h",
+ MAME_DIR .. "src/devices/sound/fmopl.cpp",
+ MAME_DIR .. "src/devices/sound/fmopl.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1218,10 +1226,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t
--if (SOUNDS["YM3526"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/3526intf.cpp",
- MAME_DIR .. "src/devices/sound/3526intf.h",
- MAME_DIR .. "src/devices/sound/fmopl.cpp",
- MAME_DIR .. "src/devices/sound/fmopl.h",
+ MAME_DIR .. "src/devices/sound/3526intf.cpp",
+ MAME_DIR .. "src/devices/sound/3526intf.h",
+ MAME_DIR .. "src/devices/sound/fmopl.cpp",
+ MAME_DIR .. "src/devices/sound/fmopl.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1229,10 +1237,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t
--if (SOUNDS["Y8950"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/8950intf.cpp",
- MAME_DIR .. "src/devices/sound/8950intf.h",
- MAME_DIR .. "src/devices/sound/fmopl.cpp",
- MAME_DIR .. "src/devices/sound/fmopl.h",
+ MAME_DIR .. "src/devices/sound/8950intf.cpp",
+ MAME_DIR .. "src/devices/sound/8950intf.h",
+ MAME_DIR .. "src/devices/sound/fmopl.cpp",
+ MAME_DIR .. "src/devices/sound/fmopl.h",
MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
MAME_DIR .. "src/devices/sound/ymdeltat.h",
}
@@ -1241,8 +1249,8 @@ end
if (SOUNDS["YMF262"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/ymf262.cpp",
- MAME_DIR .. "src/devices/sound/ymf262.h",
+ MAME_DIR .. "src/devices/sound/ymf262.cpp",
+ MAME_DIR .. "src/devices/sound/ymf262.h",
MAME_DIR .. "src/devices/sound/262intf.cpp",
MAME_DIR .. "src/devices/sound/262intf.h",
}
@@ -1283,8 +1291,18 @@ end
if (SOUNDS["YMZ770"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/ymz770.cpp",
- MAME_DIR .. "src/devices/sound/ymz770.h",
+ 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",
}
@@ -1314,3 +1332,14 @@ if (SOUNDS["VRC6"]~=null) then
}
end
+---------------------------------------------------
+-- AD1848
+--@src/devices/sound/ad1848.h,SOUNDS["AD1848"] = true
+---------------------------------------------------
+
+if (SOUNDS["AD1848"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/sound/ad1848.cpp",
+ MAME_DIR .. "src/devices/sound/ad1848.h",
+ }
+end
diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua
index d30cff64df2..b5bb5b37366 100644
--- a/docs/release/scripts/src/tests.lua
+++ b/docs/release/scripts/src/tests.lua
@@ -22,15 +22,10 @@ project "gtest"
"-Wno-unused-variable",
}
- configuration { "mingw-clang" }
- buildoptions {
- "-O0", -- crash of compiler when doing optimization
- }
-
configuration { "vs*" }
if _OPTIONS["vs"]=="intel-15" then
buildoptions {
- "/Qwd1195", -- error #1195: conversion from integer to smaller pointer
+ "/Qwd1195", -- error #1195: conversion from integer to smaller pointer
}
end
@@ -45,15 +40,15 @@ end
}
-project("tests")
+project("mametests")
uuid ("66d4c639-196b-4065-a411-7ee9266564f5")
- kind "ConsoleApp"
+ kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
- if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -67,19 +62,23 @@ project("tests")
links {
"gtest",
"utils",
- "expat",
- "zlib",
+ ext_lib("expat"),
+ ext_lib("zlib"),
"ocore_" .. _OPTIONS["osd"],
}
includedirs {
MAME_DIR .. "3rdparty/googletest/googletest/include",
MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/emu",
MAME_DIR .. "src/lib/util",
+ ext_includedir("expat"),
+ ext_includedir("zlib"),
}
files {
MAME_DIR .. "tests/main.cpp",
MAME_DIR .. "tests/lib/util/corestr.cpp",
+ MAME_DIR .. "tests/emu/attotime.cpp",
}
diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua
index 421f5cc76b5..a2e5ad73496 100644
--- a/docs/release/scripts/src/tools.lua
+++ b/docs/release/scripts/src/tools.lua
@@ -15,32 +15,24 @@
project("romcmp")
uuid ("1b40275b-194c-497b-8abd-9338775a21b8")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
+ "7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -48,6 +40,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/romcmp.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -63,51 +56,37 @@ strip()
project("chdman")
uuid ("7d948868-42db-432a-9bb5-70ce5c5f4620")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
+includedirs {
+ ext_includedir("flac"),
+}
files {
MAME_DIR .. "src/tools/chdman.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
MAME_DIR .. "src/version.cpp",
}
@@ -124,32 +103,23 @@ strip()
project("jedutil")
uuid ("bda60edb-f7f5-489f-b232-23d33c43dda1")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -157,6 +127,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/jedutil.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -172,44 +143,26 @@ strip()
project("unidasm")
uuid ("65f81d3b-299a-4b08-a3fa-d5241afa9fd1")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"dasm",
"utils",
- "expat",
- "7z",
+ ext_lib("expat"),
+ "7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -235,51 +188,37 @@ strip()
project("ldresample")
uuid ("3401561a-4407-4e13-9c6d-c0801330f7cc")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
- "7z",
+ ext_lib("expat"),
+ "7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
+includedirs {
+ ext_includedir("flac"),
+}
files {
MAME_DIR .. "src/tools/ldresample.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -295,51 +234,37 @@ strip()
project("ldverify")
uuid ("3e66560d-b928-4227-928b-eadd0a10f00a")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
- "7z",
+ ext_lib("expat"),
+ "7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
}
+includedirs {
+ ext_includedir("flac"),
+}
files {
MAME_DIR .. "src/tools/ldverify.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -355,32 +280,23 @@ strip()
project("regrep")
uuid ("7f6de580-d800-4e8d-bed6-9fc86829584d")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -388,6 +304,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/regrep.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -403,32 +320,23 @@ strip()
project("srcclean")
uuid ("4dd58139-313a-42c5-965d-f378bdeed220")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -436,6 +344,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/srcclean.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -451,32 +360,23 @@ strip()
project("src2html")
uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -484,6 +384,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/src2html.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -499,43 +400,25 @@ strip()
project("split")
uuid ("8ef6ff18-3199-4cc2-afd0-d64033070faa")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -543,6 +426,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/split.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -558,32 +442,23 @@ strip()
project("pngcmp")
uuid ("61f647d9-b129-409b-9c62-8acf98ed39be")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -591,6 +466,7 @@ includedirs {
files {
MAME_DIR .. "src/tools/pngcmp.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -606,44 +482,26 @@ strip()
project("nltool")
uuid ("853a03b7-fa37-41a8-8250-0dc23dd935d6")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
"netlist",
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -652,6 +510,7 @@ includedirs {
files {
MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -667,30 +526,31 @@ strip()
project("nlwav")
uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
+if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
end
links {
- "utils",
- "ocore_" .. _OPTIONS["osd"],
- "netlist",
+ "utils",
+ "ocore_" .. _OPTIONS["osd"],
+ "netlist",
}
includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "src/lib/netlist",
+ MAME_DIR .. "src/osd",
+ MAME_DIR .. "src/lib/util",
+ MAME_DIR .. "src/lib/netlist",
}
files {
- MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
+ MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -706,52 +566,35 @@ strip()
project("castool")
uuid ("7d9ed428-e2ba-4448-832d-d882a64d5c22")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
links {
"formats",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
files {
MAME_DIR .. "src/tools/castool.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -767,13 +610,13 @@ strip()
project("floptool")
uuid ("85d8e3a6-1661-4ac9-8c21-281d20cbaf5b")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -781,39 +624,22 @@ links {
"formats",
"emu",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
files {
MAME_DIR .. "src/tools/floptool.cpp",
+ MAME_DIR .. "src/emu/emucore.cpp",
}
configuration { "mingw*" or "vs*" }
@@ -829,13 +655,13 @@ strip()
project("imgtool")
uuid ("f3707807-e587-4297-a5d8-bc98f3d0b1ca")
-kind "ConsoleApp"
+kind "ConsoleApp"
flags {
- "Symbols", -- always include minimum symbols for executables
+ "Symbols", -- always include minimum symbols for executables
}
-if _OPTIONS["SEPARATE_BIN"]~="1" then
+if _OPTIONS["SEPARATE_BIN"]~="1" then
targetdir(MAME_DIR)
end
@@ -843,37 +669,19 @@ links {
"formats",
"emu",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
- MAME_DIR .. "src/lib",
+ MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
- MAME_DIR .. "3rdparty/zlib",
- MAME_DIR .. "src/tools/imgtool",
+ ext_includedir("zlib"),
+ MAME_DIR .. "src/tools/imgtool",
}
files {
@@ -894,21 +702,21 @@ files {
MAME_DIR .. "src/tools/imgtool/imgtool.cpp",
MAME_DIR .. "src/tools/imgtool/imgtool.h",
MAME_DIR .. "src/tools/imgtool/imgterrs.cpp",
- MAME_DIR .. "src/tools/imgtool/imgterrs.h",
- MAME_DIR .. "src/tools/imgtool/imghd.cpp",
+ MAME_DIR .. "src/tools/imgtool/imgterrs.h",
+ MAME_DIR .. "src/tools/imgtool/imghd.cpp",
MAME_DIR .. "src/tools/imgtool/imghd.h",
MAME_DIR .. "src/tools/imgtool/charconv.cpp",
MAME_DIR .. "src/tools/imgtool/charconv.h",
MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp",
MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h",
MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp",
- MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h",
+ MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h",
MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp",
MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp",
MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp",
MAME_DIR .. "src/tools/imgtool/modules/os9.cpp",
MAME_DIR .. "src/tools/imgtool/modules/mac.cpp",
- MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp",
+ MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp",
MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp",
MAME_DIR .. "src/tools/imgtool/modules/concept.cpp",
MAME_DIR .. "src/tools/imgtool/modules/fat.cpp",
@@ -933,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/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua
index 96a310f154b..984bac6a950 100644
--- a/docs/release/scripts/src/video.lua
+++ b/docs/release/scripts/src/video.lua
@@ -9,6 +9,14 @@
--
---------------------------------------------------------------------------
+files {
+ MAME_DIR .. "src/devices/video/poly.h",
+ MAME_DIR .. "src/devices/video/sprite.cpp",
+ MAME_DIR .. "src/devices/video/sprite.h",
+ MAME_DIR .. "src/devices/video/vector.cpp",
+ MAME_DIR .. "src/devices/video/vector.h",
+}
+
--------------------------------------------------
--
--@src/devices/video/315_5124.h,VIDEOS["SEGA315_5124"] = true
@@ -513,9 +521,9 @@ if (VIDEOS["MOS6566"]~=null) then
end
-files {
+files {
MAME_DIR .. "src/devices/video/cgapal.cpp",
- MAME_DIR .. "src/devices/video/cgapal.h",
+ MAME_DIR .. "src/devices/video/cgapal.h",
}
--------------------------------------------------