diff options
author | 2016-11-30 11:08:19 +1100 | |
---|---|---|
committer | 2016-11-30 11:08:19 +1100 | |
commit | 3b4cac12debe8e6d998edb6899908ac6b84a637b (patch) | |
tree | 1ad5a12a0f0b75dcfb0776e05f6e3f1c9919d212 /docs/release/scripts/src | |
parent | 05d642eaca8e1a7ce978e14d11a836513fbf98c8 (diff) |
0.180 Release fileshbmame180
Diffstat (limited to 'docs/release/scripts/src')
-rw-r--r-- | docs/release/scripts/src/3rdparty.lua | 333 | ||||
-rw-r--r-- | docs/release/scripts/src/bus.lua | 15 | ||||
-rw-r--r-- | docs/release/scripts/src/cpu.lua | 27 | ||||
-rw-r--r-- | docs/release/scripts/src/devices.lua | 2 | ||||
-rw-r--r-- | docs/release/scripts/src/emu.lua | 9 | ||||
-rw-r--r-- | docs/release/scripts/src/machine.lua | 112 | ||||
-rw-r--r-- | docs/release/scripts/src/main.lua | 52 | ||||
-rw-r--r-- | docs/release/scripts/src/mame/frontend.lua | 8 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/modules.lua | 15 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/sdl_cfg.lua | 5 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/uwp.lua | 121 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/uwp_cfg.lua | 18 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/windows_cfg.lua | 5 | ||||
-rw-r--r-- | docs/release/scripts/src/osd/winui.lua | 4 | ||||
-rw-r--r-- | docs/release/scripts/src/sound.lua | 25 | ||||
-rw-r--r-- | docs/release/scripts/src/tests.lua | 81 |
16 files changed, 535 insertions, 297 deletions
diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 22517045804..8bdc39eddb0 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -60,7 +60,7 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "vs2015*" } + configuration { "vs201*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } @@ -197,6 +197,11 @@ if _OPTIONS["vs"]=="intel-15" then } end + configuration { "winstore*" } + defines { + "NO_GETENV" + } + configuration { } files { @@ -284,7 +289,7 @@ end "-include stdint.h" } - configuration { "vs2015*" } + configuration { "vs201*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } @@ -372,11 +377,15 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end - configuration { "vs2015*" } + configuration { "vs201*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter } + configuration { "winstore*" } + forcedincludes { + MAME_DIR .. "src/osd/uwp/uwpcompat.h" + } configuration { } defines { @@ -404,6 +413,7 @@ end MAME_DIR .. "3rdparty/lzma/C/BraIA64.c", MAME_DIR .. "3rdparty/lzma/C/CpuArch.c", MAME_DIR .. "3rdparty/lzma/C/Delta.c", + -- MAME_DIR .. "3rdparty/lzma/C/DllSecur.c", MAME_DIR .. "3rdparty/lzma/C/LzFind.c", -- MAME_DIR .. "3rdparty/lzma/C/LzFindMt.c", MAME_DIR .. "3rdparty/lzma/C/Lzma2Dec.c", @@ -463,6 +473,12 @@ if _OPTIONS["vs"]=="intel-15" then "/Qwd592", -- error #592: variable "xxx" is used before its value is set } end + + configuration { "winstore*" } + forcedincludes { + MAME_DIR .. "src/osd/uwp/uwpcompat.h", + } + configuration { } defines { "LUA_COMPAT_ALL", @@ -556,15 +572,75 @@ project "lualibs" includedirs { MAME_DIR .. "3rdparty", } +if (_OPTIONS["osd"] ~= "uwp") then + includedirs { + MAME_DIR .. "3rdparty/linenoise-ng/include", + } +end includedirs { ext_includedir("lua"), ext_includedir("zlib"), + ext_includedir("sqlite3"), } + configuration { "winstore*" } + forcedincludes { + MAME_DIR .. "src/osd/uwp/uwpcompat.h" + } + + configuration {} + files { + MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", } +if (_OPTIONS["osd"] == "uwp") then + files { + MAME_DIR .. "3rdparty/lua-linenoise/linenoise_none.c", + } +else + files { + MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c", + } +end + +-------------------------------------------------- +-- SQLite3 library objects +-------------------------------------------------- + +if not _OPTIONS["with-system-sqlite3"] then +project "sqlite3" + uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" + kind "StaticLib" + + configuration { "gmake" } + buildoptions_c { + "-Wno-discarded-qualifiers", + "-Wno-unused-but-set-variable", + "-Wno-bad-function-cast", + "-Wno-undef", + } +if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then + buildoptions_c { + "-Wno-incompatible-pointer-types-discards-qualifiers", + } +end + configuration { "winstore*" } + defines { + "SQLITE_OS_WINRT", + } + + configuration { } + + files { + MAME_DIR .. "3rdparty/sqlite3/sqlite3.c", + } +else +links { + ext_lib("sqlite3"), +} +end end -------------------------------------------------- @@ -597,7 +673,7 @@ if _OPTIONS["vs"]=="intel-15" then } end - configuration { "vs2015*" } + configuration { "vs201*" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } @@ -757,7 +833,7 @@ end end end - if _OPTIONS["targetos"]=="macosx" then + if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="linux" then if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then buildoptions { "-Wno-switch", @@ -781,13 +857,15 @@ end MAME_DIR .. "3rdparty/bgfx/src/glcontext_ppapi.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp", MAME_DIR .. "3rdparty/bgfx/src/image.cpp", + MAME_DIR .. "3rdparty/bgfx/src/hmd.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_gnm.cpp", + MAME_DIR .. "3rdparty/bgfx/src/renderer_noop.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp", MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader.cpp", @@ -812,7 +890,6 @@ end 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_draw.cpp", - MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_wm.cpp", } if _OPTIONS["targetos"]=="macosx" then files { @@ -848,7 +925,7 @@ end -- "/Qwd1879", -- warning #1879: unimplemented pragma ignored -- } --end --- configuration { "vs2015*" } +-- configuration { "vs201*" } -- buildoptions { -- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration -- } @@ -976,207 +1053,6 @@ end --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" - - includedirs { - MAME_DIR .. "3rdparty/libuv/include", - MAME_DIR .. "3rdparty/libuv/src", - MAME_DIR .. "3rdparty/libuv/src/win", - } - - configuration { "gmake or ninja" } - buildoptions_c { - "-Wno-strict-prototypes", - "-Wno-bad-function-cast", - "-Wno-write-strings", - "-Wno-missing-braces", - "-Wno-undef", - "-Wno-unused-variable", - } - - - local version = str_to_version(_OPTIONS["gcc_version"]) - if (_OPTIONS["gcc"]~=nil) then - if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then - buildoptions_c { - "-Wno-unknown-warning-option", - "-Wno-unknown-attributes", - "-Wno-null-dereference", - "-Wno-unused-but-set-variable", - "-Wno-maybe-uninitialized", - } - else - buildoptions_c { - "-Wno-unused-but-set-variable", - "-Wno-maybe-uninitialized", - } - end - end - - configuration { "vs*" } - buildoptions { - "/wd4054", -- warning C4054: 'type cast' : from function pointer 'xxx' to data pointer 'void *' - "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer - "/wd4210", -- warning C4210: nonstandard extension used : function given file scope - "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used - "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used - "/wd4477", -- warning C4477: '<function>' : format string '<format-string>' requires an argument of type '<type>', but variadic argument <position> has type '<type>' - } - - configuration { } - - files { - MAME_DIR .. "3rdparty/libuv/src/fs-poll.c", - MAME_DIR .. "3rdparty/libuv/src/inet.c", - MAME_DIR .. "3rdparty/libuv/src/threadpool.c", - MAME_DIR .. "3rdparty/libuv/src/uv-common.c", - MAME_DIR .. "3rdparty/libuv/src/version.c", - } - - if _OPTIONS["targetos"]=="windows" then - defines { - "WIN32_LEAN_AND_MEAN", - "_WIN32_WINNT=0x0502", - } - configuration { } - files { - MAME_DIR .. "3rdparty/libuv/src/win/async.c", - MAME_DIR .. "3rdparty/libuv/src/win/core.c", - MAME_DIR .. "3rdparty/libuv/src/win/dl.c", - MAME_DIR .. "3rdparty/libuv/src/win/error.c", - MAME_DIR .. "3rdparty/libuv/src/win/fs-event.c", - MAME_DIR .. "3rdparty/libuv/src/win/fs.c", - MAME_DIR .. "3rdparty/libuv/src/win/getaddrinfo.c", - MAME_DIR .. "3rdparty/libuv/src/win/getnameinfo.c", - MAME_DIR .. "3rdparty/libuv/src/win/handle.c", - MAME_DIR .. "3rdparty/libuv/src/win/loop-watcher.c", - MAME_DIR .. "3rdparty/libuv/src/win/pipe.c", - MAME_DIR .. "3rdparty/libuv/src/win/poll.c", - MAME_DIR .. "3rdparty/libuv/src/win/process-stdio.c", - MAME_DIR .. "3rdparty/libuv/src/win/process.c", - MAME_DIR .. "3rdparty/libuv/src/win/req.c", - MAME_DIR .. "3rdparty/libuv/src/win/signal.c", - MAME_DIR .. "3rdparty/libuv/src/win/stream.c", - MAME_DIR .. "3rdparty/libuv/src/win/tcp.c", - MAME_DIR .. "3rdparty/libuv/src/win/thread.c", - MAME_DIR .. "3rdparty/libuv/src/win/timer.c", - MAME_DIR .. "3rdparty/libuv/src/win/tty.c", - MAME_DIR .. "3rdparty/libuv/src/win/udp.c", - MAME_DIR .. "3rdparty/libuv/src/win/util.c", - MAME_DIR .. "3rdparty/libuv/src/win/winapi.c", - MAME_DIR .. "3rdparty/libuv/src/win/winsock.c", - } - end - - if _OPTIONS["targetos"]~="windows" then - files { - MAME_DIR .. "3rdparty/libuv/src/unix/async.c", - MAME_DIR .. "3rdparty/libuv/src/unix/atomic-ops.h", - MAME_DIR .. "3rdparty/libuv/src/unix/core.c", - MAME_DIR .. "3rdparty/libuv/src/unix/dl.c", - MAME_DIR .. "3rdparty/libuv/src/unix/fs.c", - MAME_DIR .. "3rdparty/libuv/src/unix/getaddrinfo.c", - MAME_DIR .. "3rdparty/libuv/src/unix/getnameinfo.c", - MAME_DIR .. "3rdparty/libuv/src/unix/internal.h", - MAME_DIR .. "3rdparty/libuv/src/unix/loop-watcher.c", - MAME_DIR .. "3rdparty/libuv/src/unix/loop.c", - MAME_DIR .. "3rdparty/libuv/src/unix/pipe.c", - MAME_DIR .. "3rdparty/libuv/src/unix/poll.c", - MAME_DIR .. "3rdparty/libuv/src/unix/process.c", - MAME_DIR .. "3rdparty/libuv/src/unix/signal.c", - MAME_DIR .. "3rdparty/libuv/src/unix/spinlock.h", - MAME_DIR .. "3rdparty/libuv/src/unix/stream.c", - MAME_DIR .. "3rdparty/libuv/src/unix/tcp.c", - MAME_DIR .. "3rdparty/libuv/src/unix/thread.c", - MAME_DIR .. "3rdparty/libuv/src/unix/timer.c", - MAME_DIR .. "3rdparty/libuv/src/unix/tty.c", - MAME_DIR .. "3rdparty/libuv/src/unix/udp.c", - } - end - if _OPTIONS["targetos"]=="linux" then - defines { - "_GNU_SOURCE", - } - files { - 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/proctitle.c", - } - end - if _OPTIONS["targetos"]=="macosx" then - defines { - "_DARWIN_USE_64_BIT_INODE=1", - "_DARWIN_UNLIMITED_SELECT=1", - } - files { - MAME_DIR .. "3rdparty/libuv/src/unix/darwin.c", - MAME_DIR .. "3rdparty/libuv/src/unix/darwin-proctitle.c", - MAME_DIR .. "3rdparty/libuv/src/unix/fsevents.c", - MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", - 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__", - "_XOPEN_SOURCE=500", - } - files { - MAME_DIR .. "3rdparty/libuv/src/unix/sunos.c", - } - end - if _OPTIONS["targetos"]=="freebsd" then - files { - MAME_DIR .. "3rdparty/libuv/src/unix/freebsd.c", - MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", - } - end - if _OPTIONS["targetos"]=="netbsd" then - files { - MAME_DIR .. "3rdparty/libuv/src/unix/netbsd.c", - MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c", - } - links { - "kvm", - } - end - - if (_OPTIONS["SHADOW_CHECK"]=="1") then - removebuildoptions { - "-Wshadow" - } - end -end - -end --------------------------------------------------- -- SDL2 library -------------------------------------------------- if _OPTIONS["with-bundled-sdl2"] then @@ -1307,7 +1183,6 @@ end 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", @@ -1507,7 +1382,7 @@ 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.m", 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", @@ -1638,12 +1513,20 @@ end } buildoptions_c { "-Wno-undef", + "-Wno-format", + "-Wno-format-security", "-Wno-strict-prototypes", "-Wno-bad-function-cast", + "-Wno-pointer-to-int-cast", "-Wno-discarded-qualifiers", "-Wno-unused-but-set-variable", } + configuration { "mingw-clang"} + buildoptions_c { + "-Wno-incompatible-pointer-types-discards-qualifiers" + } + configuration { "osx*"} buildoptions { "-Wno-undef", @@ -1674,3 +1557,31 @@ end } end + +-------------------------------------------------- +-- linenoise-ng library +-------------------------------------------------- +if (_OPTIONS["osd"] ~= "uwp") then +project "linenoise-ng" + uuid "7320ffc8-2748-4add-8864-ae29b72a8511" + kind (LIBTYPE) + + addprojectflags() + + configuration { "vs*" } + buildoptions { + "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used + } + + configuration { } + + includedirs { + MAME_DIR .. "3rdparty/linenoise-ng/include", + } + + files { + MAME_DIR .. "3rdparty/linenoise-ng/src/ConvertUTF.cpp", + MAME_DIR .. "3rdparty/linenoise-ng/src/linenoise.cpp", + MAME_DIR .. "3rdparty/linenoise-ng/src/wcwidth.cpp", + } +end diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 85131fa8094..30393418485 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -219,7 +219,7 @@ end --------------------------------------------------- -- ---@src/devices/bus/bbc/fds/fds.h,BUSES["BBC_FDC"] = true +--@src/devices/bus/bbc/fdc/fdc.h,BUSES["BBC_FDC"] = true --------------------------------------------------- if (BUSES["BBC_FDC"]~=null) then @@ -2913,6 +2913,19 @@ end --------------------------------------------------- -- +--@src/devices/bus/hp9845_io/hp9845_io.h,BUSES["HP9845_IO"] = true +--------------------------------------------------- + +if (BUSES["HP9845_IO"]~=null) then + files { + MAME_DIR .. "src/devices/bus/hp9845_io/hp9845_io.cpp", + MAME_DIR .. "src/devices/bus/hp9845_io/98034.cpp", + MAME_DIR .. "src/devices/bus/hp9845_io/98035.cpp", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/compis/graphics.h,BUSES["COMPIS_GRAPHICS"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index a9dfe0ecd70..126d28ed524 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -646,6 +646,12 @@ if (CPUS["SH2"]~=null) then MAME_DIR .. "src/devices/cpu/sh2/sh2.cpp", MAME_DIR .. "src/devices/cpu/sh2/sh2.h", MAME_DIR .. "src/devices/cpu/sh2/sh2fe.cpp", + MAME_DIR .. "src/devices/cpu/sh2/sh7604_bus.cpp", + MAME_DIR .. "src/devices/cpu/sh2/sh7604_bus.h", + MAME_DIR .. "src/devices/cpu/sh2/sh7604_sci.cpp", + MAME_DIR .. "src/devices/cpu/sh2/sh7604_sci.h", + MAME_DIR .. "src/devices/cpu/sh2/sh7604_wdt.cpp", + MAME_DIR .. "src/devices/cpu/sh2/sh7604_wdt.h", --MAME_DIR .. "src/devices/cpu/sh2/sh2comn.cpp", --MAME_DIR .. "src/devices/cpu/sh2/sh2comn.h", --MAME_DIR .. "src/devices/cpu/sh2/sh2drc.cpp", @@ -698,6 +704,22 @@ if (CPUS["HPHYBRID"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- +-- HP Nanoprocessor +--@src/devices/cpu/nanoprocessor/nanoprocessor.h,CPUS["NANOPROCESSOR"] = true +-------------------------------------------------- + +if (CPUS["NANOPROCESSOR"]~=null) then + files { + MAME_DIR .. "src/devices/cpu/nanoprocessor/nanoprocessor.cpp", + MAME_DIR .. "src/devices/cpu/nanoprocessor/nanoprocessor.h", + } +end + +if (CPUS["NANOPROCESSOR"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nanoprocessor/nanoprocessor_dasm.cpp") +end + +-------------------------------------------------- -- Hudsonsoft 6280 --@src/devices/cpu/h6280/h6280.h,CPUS["H6280"] = true -------------------------------------------------- @@ -1350,9 +1372,7 @@ if (CPUS["M6809"]~=null) then end if (CPUS["M6809"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6809dasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6309dasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/knmidasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6x09dasm.cpp") end -------------------------------------------------- @@ -1495,6 +1515,7 @@ if (CPUS["NEC"]~=null) then files { MAME_DIR .. "src/devices/cpu/nec/nec.cpp", MAME_DIR .. "src/devices/cpu/nec/nec.h", + MAME_DIR .. "src/devices/cpu/nec/nec_common.h", MAME_DIR .. "src/devices/cpu/nec/necea.h", MAME_DIR .. "src/devices/cpu/nec/necinstr.h", MAME_DIR .. "src/devices/cpu/nec/necinstr.hxx", diff --git a/docs/release/scripts/src/devices.lua b/docs/release/scripts/src/devices.lua index 081bc7617bb..cd90ffe30a4 100644 --- a/docs/release/scripts/src/devices.lua +++ b/docs/release/scripts/src/devices.lua @@ -42,6 +42,7 @@ function devicesProject(_target, _subtarget) GEN_DIR .. "emu/layout", ext_includedir("expat"), ext_includedir("flac"), + MAME_DIR .. "3rdparty/asio/include", } dofile(path.join("src", "cpu.lua")) @@ -69,6 +70,7 @@ if #disasm_files > 0 then MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", + MAME_DIR .. "3rdparty/asio/include", GEN_DIR .. "emu", ext_includedir("expat"), } diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index cc0e2f8e649..cd94d54f925 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -33,6 +33,7 @@ includedirs { ext_includedir("zlib"), ext_includedir("flac"), ext_includedir("jpeg"), + MAME_DIR .. "3rdparty/asio/include", } files { @@ -123,6 +124,8 @@ files { MAME_DIR .. "src/emu/image.h", MAME_DIR .. "src/emu/input.cpp", MAME_DIR .. "src/emu/input.h", + MAME_DIR .. "src/emu/inputdev.cpp", + MAME_DIR .. "src/emu/inputdev.h", MAME_DIR .. "src/emu/ioport.cpp", MAME_DIR .. "src/emu/ioport.h", MAME_DIR .. "src/emu/inpttype.h", @@ -132,6 +135,8 @@ files { MAME_DIR .. "src/emu/mconfig.h", MAME_DIR .. "src/emu/memarray.cpp", MAME_DIR .. "src/emu/memarray.h", + MAME_DIR .. "src/emu/natkeyboard.cpp", + MAME_DIR .. "src/emu/natkeyboard.h", MAME_DIR .. "src/emu/network.cpp", MAME_DIR .. "src/emu/network.h", MAME_DIR .. "src/emu/parameters.cpp", @@ -247,11 +252,11 @@ dependency { } custombuildtask { - { 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" }}, + { 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_t" }}, } 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" }}, + { 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_t" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 2e44d8d91e8..01808d48c78 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -284,6 +284,30 @@ end --------------------------------------------------- -- +--@src/devices/machine/7400.h,MACHINES["TTL7400"] = true +--------------------------------------------------- + +if (MACHINES["TTL7400"]~=null) then + files { + MAME_DIR .. "src/devices/machine/7400.cpp", + MAME_DIR .. "src/devices/machine/7400.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/7404.h,MACHINES["TTL7404"] = true +--------------------------------------------------- + +if (MACHINES["TTL7404"]~=null) then + files { + MAME_DIR .. "src/devices/machine/7404.cpp", + MAME_DIR .. "src/devices/machine/7404.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/74123.h,MACHINES["TTL74123"] = true --------------------------------------------------- @@ -333,6 +357,30 @@ end --------------------------------------------------- -- +--@src/devices/machine/74161.h,MACHINES["TTL74161"] = true +--------------------------------------------------- + +if (MACHINES["TTL74161"]~=null) then + files { + MAME_DIR .. "src/devices/machine/74161.cpp", + MAME_DIR .. "src/devices/machine/74161.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/74175.h,MACHINES["TTL74175"] = true +--------------------------------------------------- + +if (MACHINES["TTL74175"]~=null) then + files { + MAME_DIR .. "src/devices/machine/74175.cpp", + MAME_DIR .. "src/devices/machine/74175.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/74181.h,MACHINES["TTL74181"] = true --------------------------------------------------- @@ -357,6 +405,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/82s129.h,MACHINES["PROM82S129"] = true +--------------------------------------------------- + +if (MACHINES["PROM82S129"]~=null) then + files { + MAME_DIR .. "src/devices/machine/82s129.cpp", + MAME_DIR .. "src/devices/machine/82s129.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/8042kbdc.h,MACHINES["KBDC8042"] = true --------------------------------------------------- @@ -453,6 +513,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/am2847.h,MACHINES["AM2847"] = true +--------------------------------------------------- + +if (MACHINES["AM2847"]~=null) then + files { + MAME_DIR .. "src/devices/machine/am2847.cpp", + MAME_DIR .. "src/devices/machine/am2847.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/am53cf96.h,MACHINES["AM53CF96"] = true --------------------------------------------------- @@ -635,6 +707,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/dm9334.h,MACHINES["DM9334"] = true +--------------------------------------------------- + +if (MACHINES["DM9334"]~=null) then + files { + MAME_DIR .. "src/devices/machine/dm9334.cpp", + MAME_DIR .. "src/devices/machine/dm9334.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/ds1204.h,MACHINES["DS1204"] = true --------------------------------------------------- @@ -671,6 +755,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/ds1386.h,MACHINES["DS1386"] = true +--------------------------------------------------- + +if (MACHINES["DS1386"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ds1386.cpp", + MAME_DIR .. "src/devices/machine/ds1386.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/ds2401.h,MACHINES["DS2401"] = true --------------------------------------------------- @@ -1203,7 +1299,7 @@ end --------------------------------------------------- -- ---@src/devices/machine/ldp1000.h,MACHINES["LDP1450"] = true +--@src/devices/machine/ldp1450.h,MACHINES["LDP1450"] = true --------------------------------------------------- if (MACHINES["LDP1450"]~=null) then @@ -1263,18 +1359,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/matsucd.h,MACHINES["MATSUCD"] = true ---------------------------------------------------- - -if (MACHINES["MATSUCD"]~=null) then - files { - MAME_DIR .. "src/devices/machine/matsucd.cpp", - MAME_DIR .. "src/devices/machine/matsucd.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/mb14241.h,MACHINES["MB14241"] = true --------------------------------------------------- @@ -1788,6 +1872,8 @@ if (MACHINES["PCI"]~=null) then MAME_DIR .. "src/devices/machine/i6300esb.h", MAME_DIR .. "src/devices/machine/i82439hx.cpp", MAME_DIR .. "src/devices/machine/i82439hx.h", + MAME_DIR .. "src/devices/machine/i82439tx.cpp", + MAME_DIR .. "src/devices/machine/i82439tx.h", MAME_DIR .. "src/devices/machine/i82371sb.cpp", MAME_DIR .. "src/devices/machine/i82371sb.h", MAME_DIR .. "src/devices/machine/lpc.cpp", diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index c33d1554157..137cb6979d0 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -48,6 +48,10 @@ end "ppapi_gles2", "pthread", } + + configuration { "winstore*" } + kind "WindowedApp" + configuration { } addprojectflags() @@ -69,6 +73,36 @@ end "Unicode", } + configuration { "winstore*" } + -- Windows Required Files + files { + -- Manifest file + MAME_DIR .. "scripts/resources/uwp/Package.appxmanifest", + } + + configuration { "winstore*" } + files { + MAME_DIR .. "scripts/resources/uwp/assets/*.png" + } + configuration "**/scripts/resources/uwp/assets/*.png" + flags { "DeploymentContent" } + + -- Effects and Shaders + configuration { "winstore*" } + files { + MAME_DIR .. "artwork/*", + MAME_DIR .. "artwork/**/*", + MAME_DIR .. "bgfx/*", + MAME_DIR .. "bgfx/**/*", + MAME_DIR .. "hash/*", + MAME_DIR .. "language/*", + MAME_DIR .. "language/**/*", + MAME_DIR .. "plugins/*", + MAME_DIR .. "plugins/**/*", + } + configuration "**/*" + flags { "DeploymentContent" } + configuration { "x64", "Release" } targetsuffix "64" if _OPTIONS["PROFILE"] then @@ -128,7 +162,7 @@ end .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles" + .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/essl@bgfx/shaders/essl" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then @@ -137,6 +171,11 @@ end .. " -s DEMANGLE_SUPPORT=1" end + if _OPTIONS["WEBASSEMBLY"] then + emccopts = emccopts + .. " -s BINARYEN=1" + end + if _OPTIONS["ARCHOPTS"] then emccopts = emccopts .. " " .. _OPTIONS["ARCHOPTS"] end @@ -228,15 +267,16 @@ if (STANDALONE~=true) then ext_lib("lua"), "lualibs", } +if (_OPTIONS["osd"] ~= "uwp") then + links { + "linenoise-ng", + } +end end - if _OPTIONS["USE_LIBUV"]=="1" then - links { - ext_lib("uv"), - } - end links { ext_lib("zlib"), ext_lib("flac"), + ext_lib("sqlite3"), } if _OPTIONS["NO_USE_MIDI"]~="1" then diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua index 41d0598cb15..3af66578ad6 100644 --- a/docs/release/scripts/src/mame/frontend.lua +++ b/docs/release/scripts/src/mame/frontend.lua @@ -40,8 +40,14 @@ includedirs { ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("flac"), + MAME_DIR .. "3rdparty/asio/include", } +configuration { "vs*" } + buildoptions { + "/bigobj", + } +configuration { } if (_OPTIONS["targetos"] == "windows") then defines { "UI_WINDOWS", @@ -71,6 +77,8 @@ files { 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/media_ident.cpp", + MAME_DIR .. "src/frontend/mame/media_ident.h", MAME_DIR .. "src/frontend/mame/pluginopts.cpp", MAME_DIR .. "src/frontend/mame/pluginopts.h", MAME_DIR .. "src/frontend/mame/ui/ui.cpp", diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 7fb7a81f90b..a863cd360b9 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -101,24 +101,13 @@ function osdmodulesbuild() 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/input/input_uwp.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/output/win32_output.cpp", MAME_DIR .. "src/osd/modules/output/win32_output.h", - 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", MAME_DIR .. "src/osd/modules/monitor/monitor_common.h", MAME_DIR .. "src/osd/modules/monitor/monitor_common.cpp", MAME_DIR .. "src/osd/modules/monitor/monitor_win32.cpp", @@ -126,7 +115,7 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp", } includedirs { - ext_includedir("uv"), + MAME_DIR .. "3rdparty/asio/include", } if _OPTIONS["targetos"]=="windows" then diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua index b73c9253819..b8f24d27d3b 100644 --- a/docs/release/scripts/src/osd/sdl_cfg.lua +++ b/docs/release/scripts/src/osd/sdl_cfg.lua @@ -108,12 +108,9 @@ if _OPTIONS["targetos"]=="windows" then "UNICODE", "_UNICODE", "main=utf8_main", + "_WIN32_WINNT=0x0501", } - configuration { "Debug" } - defines { - "MALLOC_DEBUG", - } configuration { } elseif _OPTIONS["targetos"]=="linux" then diff --git a/docs/release/scripts/src/osd/uwp.lua b/docs/release/scripts/src/osd/uwp.lua new file mode 100644 index 00000000000..47e8e149e24 --- /dev/null +++ b/docs/release/scripts/src/osd/uwp.lua @@ -0,0 +1,121 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +--------------------------------------------------------------------------- +-- +-- uwp.lua +-- +-- Rules for the building of UWP OSD +-- +--------------------------------------------------------------------------- + +dofile("modules.lua") + +function maintargetosdoptions(_target,_subtarget) +end + +project ("qtdbg_" .. _OPTIONS["osd"]) + uuid (os.uuid("qtdbg_" .. _OPTIONS["osd"])) + kind (LIBTYPE) + + dofile("uwp_cfg.lua") + includedirs { + MAME_DIR .. "src/emu", + MAME_DIR .. "src/devices", -- accessing imagedev from debugger + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/render", + MAME_DIR .. "3rdparty", + } + removeflags { + "SingleOutputDir", + } + + files { + MAME_DIR .. "src/osd/modules/debugger/debugqt.cpp", + } + +project ("osd_" .. _OPTIONS["osd"]) + uuid (os.uuid("osd_" .. _OPTIONS["osd"])) + kind (LIBTYPE) + + removeflags { + "SingleOutputDir", + } + + dofile("uwp_cfg.lua") + osdmodulesbuild() + + includedirs { + MAME_DIR .. "src/emu", + MAME_DIR .. "src/devices", -- accessing imagedev from debugger + 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", + } + + includedirs { + MAME_DIR .. "src/osd/uwp", + MAME_DIR .. "src/osd/windows", + } + + files { + MAME_DIR .. "src/osd/uwp/video.cpp", + MAME_DIR .. "src/osd/uwp/video.h", + MAME_DIR .. "src/osd/uwp/window.cpp", + MAME_DIR .. "src/osd/uwp/window.h", + MAME_DIR .. "src/osd/windows/winutf8.cpp", + MAME_DIR .. "src/osd/windows/winutf8.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/modules/render/drawnone.cpp", + MAME_DIR .. "src/osd/modules/render/drawnone.h", + MAME_DIR .. "src/osd/uwp/uwpcompat.cpp", + MAME_DIR .. "src/osd/uwp/uwpcompat.h", + MAME_DIR .. "src/osd/osdepend.h", + } + +project ("ocore_" .. _OPTIONS["osd"]) + uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) + kind (LIBTYPE) + + removeflags { + "SingleOutputDir", + } + + dofile("uwp_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", + } + + files { + 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/osdsync.cpp", + MAME_DIR .. "src/osd/osdsync.h", + MAME_DIR .. "src/osd/windows/winutil.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/winrtdir.cpp", + MAME_DIR .. "src/osd/modules/file/winrtfile.cpp", + MAME_DIR .. "src/osd/modules/file/winrtfile.h", + MAME_DIR .. "src/osd/modules/file/winrtptty.cpp", + MAME_DIR .. "src/osd/modules/file/winrtsocket.cpp", + MAME_DIR .. "src/osd/modules/lib/osdlib_uwp.cpp", + } diff --git a/docs/release/scripts/src/osd/uwp_cfg.lua b/docs/release/scripts/src/osd/uwp_cfg.lua new file mode 100644 index 00000000000..234327aada0 --- /dev/null +++ b/docs/release/scripts/src/osd/uwp_cfg.lua @@ -0,0 +1,18 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +defines { + "OSD_UWP=1", + "USE_QTDEBUG=0", + "SDLMAME_NOASM=1", + "USE_OPENGL=0", + "NO_USE_MIDI=1", + "WINVER=0x0603", + "_WIN32_WINNT=0x0603", + "NTDDI_VERSION=0x06030000", + "MODERN_WIN_API", +} + +flags { + "Unicode", +} diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua index b7636e5b435..1ba0efe6151 100644 --- a/docs/release/scripts/src/osd/windows_cfg.lua +++ b/docs/release/scripts/src/osd/windows_cfg.lua @@ -12,11 +12,6 @@ configuration { "mingw* or vs*" } "main=utf8_main", } -configuration { "Debug" } - defines { - "MALLOC_DEBUG", - } - configuration { "vs*" } flags { "Unicode", diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index 85f122bfa16..76b6902145b 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -172,8 +172,8 @@ project ("osd_" .. _OPTIONS["osd"]) 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/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", diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua index ba2e689a820..fc555804072 100644 --- a/docs/release/scripts/src/sound.lua +++ b/docs/release/scripts/src/sound.lua @@ -532,6 +532,20 @@ end --------------------------------------------------- +-- MEA8000 Voice Synthesizer +--@src/devices/sound/mea8000.h,SOUNDS["MEA8000"] = true +--------------------------------------------------- + +if (SOUNDS["MEA8000"]~=null) then + files { + MAME_DIR .. "src/devices/sound/mea8000.cpp", + MAME_DIR .. "src/devices/sound/mea8000.h", + } +end + + + +--------------------------------------------------- -- MOS 6560VIC --@src/devices/sound/mos6560.h,SOUNDS["MOS656X"] = true --------------------------------------------------- @@ -1376,3 +1390,14 @@ if (SOUNDS["PCD3311"]~=null) then MAME_DIR .. "src/devices/sound/pcd3311.h", } end + +--------------------------------------------------- +-- Voltage Regulator +--@src/devices/sound/volt_reg.h,SOUNDS["VOLT_REG"] = true +--------------------------------------------------- +if (SOUNDS["VOLT_REG"]~=null) then + files { + MAME_DIR .. "src/devices/sound/volt_reg.cpp", + MAME_DIR .. "src/devices/sound/volt_reg.h", + } +end diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua index e0a8da88d75..cb0bd3ee3ad 100644 --- a/docs/release/scripts/src/tests.lua +++ b/docs/release/scripts/src/tests.lua @@ -8,37 +8,6 @@ -- Rules for building tests -- --------------------------------------------------------------------------- --------------------------------------------------- --- GoogleTest library objects --------------------------------------------------- - -project "gtest" - uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" - kind "StaticLib" - - configuration { "gmake or ninja" } - buildoptions { - "-Wno-undef", - "-Wno-unused-variable", - } - - configuration { "vs*" } -if _OPTIONS["vs"]=="intel-15" then - buildoptions { - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer - } -end - - configuration { } - - includedirs { - MAME_DIR .. "3rdparty/googletest/googletest/include", - MAME_DIR .. "3rdparty/googletest/googletest", - } - files { - MAME_DIR .. "3rdparty/googletest/googletest/src/gtest-all.cc", - } - project("mametests") uuid ("66d4c639-196b-4065-a411-7ee9266564f5") @@ -52,15 +21,52 @@ project("mametests") targetdir(MAME_DIR) end - configuration { "gmake or ninja" } - buildoptions { - "-Wno-undef", - } + configuration { "x64", "Release" } + targetsuffix "64" + if _OPTIONS["PROFILE"] then + targetsuffix "64p" + end + + configuration { "x64", "Debug" } + targetsuffix "64d" + if _OPTIONS["PROFILE"] then + targetsuffix "64dp" + end + + configuration { "x32", "Release" } + targetsuffix "" + if _OPTIONS["PROFILE"] then + targetsuffix "p" + end + + configuration { "x32", "Debug" } + targetsuffix "d" + if _OPTIONS["PROFILE"] then + targetsuffix "dp" + end + + configuration { "Native", "Release" } + targetsuffix "" + if _OPTIONS["PROFILE"] then + targetsuffix "p" + end + + configuration { "Native", "Debug" } + targetsuffix "d" + if _OPTIONS["PROFILE"] then + targetsuffix "dp" + end + + configuration { "mingw*" or "vs*" } + targetextension ".exe" + + configuration { "rpi" } + targetextension "" + configuration { } links { - "gtest", "utils", ext_lib("expat"), ext_lib("zlib"), @@ -68,7 +74,7 @@ project("mametests") } includedirs { - MAME_DIR .. "3rdparty/googletest/googletest/include", + MAME_DIR .. "3rdparty/catch/single_include", MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", @@ -79,6 +85,7 @@ project("mametests") files { MAME_DIR .. "tests/main.cpp", MAME_DIR .. "tests/lib/util/corestr.cpp", + MAME_DIR .. "tests/lib/util/options.cpp", MAME_DIR .. "tests/emu/attotime.cpp", } |