diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 275 | ||||
-rw-r--r-- | scripts/src/benchmarks.lua | 74 | ||||
-rw-r--r-- | scripts/src/bus.lua | 14 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 9 | ||||
-rw-r--r-- | scripts/src/emu.lua | 62 | ||||
-rw-r--r-- | scripts/src/machine.lua | 12 | ||||
-rw-r--r-- | scripts/src/main.lua | 15 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 36 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/osdmini_cfg.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 123 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 36 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 2 | ||||
-rw-r--r-- | scripts/src/tests.lua | 98 | ||||
-rw-r--r-- | scripts/src/tools.lua | 111 | ||||
-rw-r--r-- | scripts/src/video.lua | 24 |
17 files changed, 698 insertions, 198 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 2bee6477f01..04038127dfb 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -280,6 +280,11 @@ end buildoptions { "-Wno-enum-conversion", } + if _OPTIONS["targetos"]=="macosx" then + buildoptions_c { + "-Wno-unknown-attributes", + } + end end configuration { } @@ -398,6 +403,8 @@ end configuration { } defines { "LUA_COMPAT_ALL", + "LUA_COMPAT_5_1", + "LUA_COMPAT_5_2", } if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then defines { @@ -458,20 +465,19 @@ links { end -------------------------------------------------- --- sqlite3 lua library objects +-- small lua library objects -------------------------------------------------- -project "lsqlite3" +project "lualibs" uuid "1d84edab-94cf-48fb-83ee-b75bc697660e" kind "StaticLib" - -- options { - -- "ForceCPP", - -- } - configuration { "vs*" } buildoptions { "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx' + "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression + "/wd4130", -- warning C4130: '==': logical operation on address of string constant } configuration { } @@ -487,9 +493,69 @@ project "lsqlite3" MAME_DIR .. "3rdparty/lua/src", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", + MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", + MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", + } + +-------------------------------------------------- +-- 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", } -------------------------------------------------- @@ -639,7 +705,6 @@ end -- BGFX library objects -------------------------------------------------- -if (USE_BGFX == 1) then project "bgfx" uuid "d3e7e119-35cf-4f4f-aba0-d3bdcd1b879a" kind "StaticLib" @@ -664,10 +729,14 @@ end MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", - MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include", } + configuration { "not steamlink"} + includedirs { + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", + } + configuration { "vs*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/msvc", @@ -763,7 +832,6 @@ end MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm", } end -end -------------------------------------------------- -- PortAudio library objects @@ -919,37 +987,194 @@ links { end -------------------------------------------------- --- GoogleTest library objects +-- libuv library objects -------------------------------------------------- - -project "gtest" - uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" +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" } - buildoptions { + buildoptions_c { + "-Wno-strict-prototypes", + "-Wno-bad-function-cast", + "-Wno-write-strings", + "-Wno-missing-braces", "-Wno-undef", "-Wno-unused-variable", } - configuration { "mingw-clang" } - buildoptions { - "-O0", -- crash of compiler when doing optimization - } + + local version = str_to_version(_OPTIONS["gcc_version"]) + if (_OPTIONS["gcc"]~=nil) then + if string.find(_OPTIONS["gcc"], "clang") 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*" } -if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + "/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>' } -end configuration { } - includedirs { - MAME_DIR .. "3rdparty/googletest/googletest/include", - MAME_DIR .. "3rdparty/googletest/googletest", + 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", + } + if _ACTION == "vs2013" then + files { + MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c", + } + end + 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"]=="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["SHADOW_CHECK"]=="1") then + removebuildoptions { + "-Wshadow" + } + end + +-------------------------------------------------- +-- HTTP parser library objects +-------------------------------------------------- + +project "http-parser" + uuid "90c6ba59-bdb2-4fee-8b44-57601d690e14" + kind "StaticLib" + + configuration { } + files { - MAME_DIR .. "3rdparty/googletest/googletest/src/gtest-all.cc", + MAME_DIR .. "3rdparty/http-parser/http_parser.c", } + if (_OPTIONS["SHADOW_CHECK"]=="1") then + removebuildoptions { + "-Wshadow" + } + end diff --git a/scripts/src/benchmarks.lua b/scripts/src/benchmarks.lua new file mode 100644 index 00000000000..f774e3f45ca --- /dev/null +++ b/scripts/src/benchmarks.lua @@ -0,0 +1,74 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +--------------------------------------------------------------------------- +-- +-- benchmarks.lua +-- +-- Rules for building benchmarks +-- +--------------------------------------------------------------------------- + +-------------------------------------------------- +-- Google Benchmark library objects +-------------------------------------------------- + +project "benchmark" + uuid "60a7e05c-8b4f-497c-bfda-2949a009ba0d" + kind "StaticLib" + + configuration { } + defines { + "HAVE_STD_REGEX", + } + + includedirs { + MAME_DIR .. "3rdparty/benchmark/include", + } + files { + MAME_DIR .. "3rdparty/benchmark/src/benchmark.cc", + MAME_DIR .. "3rdparty/benchmark/src/colorprint.cc", + MAME_DIR .. "3rdparty/benchmark/src/commandlineflags.cc", + MAME_DIR .. "3rdparty/benchmark/src/console_reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/csv_reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/json_reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/log.cc", + MAME_DIR .. "3rdparty/benchmark/src/reporter.cc", + MAME_DIR .. "3rdparty/benchmark/src/sleep.cc", + MAME_DIR .. "3rdparty/benchmark/src/string_util.cc", + MAME_DIR .. "3rdparty/benchmark/src/sysinfo.cc", + MAME_DIR .. "3rdparty/benchmark/src/walltime.cc", + MAME_DIR .. "3rdparty/benchmark/src/re_std.cc", + } + + + +project("benchmarks") + uuid ("a9750a48-d283-4a6d-b126-31c7ce049af1") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + configuration { } + + links { + "benchmark", + } + + includedirs { + MAME_DIR .. "3rdparty/benchmark/include", + MAME_DIR .. "src/osd", + } + + files { + MAME_DIR .. "benchmarks/main.cpp", + MAME_DIR .. "benchmarks/eminline_native.cpp", + MAME_DIR .. "benchmarks/eminline_noasm.cpp", + } + diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index bafa63a269d..9514e9f5a74 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2558,3 +2558,17 @@ if (BUSES["CGENIE_PARALLEL"]~=null) then MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h", } end + +--------------------------------------------------- +-- +--@src/devices/bus/m5/slot.h,BUSES["M5"] = true +--------------------------------------------------- +if (BUSES["M5"]~=null) then + files { + MAME_DIR .. "src/devices/bus/m5/slot.cpp", + MAME_DIR .. "src/devices/bus/m5/slot.h", + MAME_DIR .. "src/devices/bus/m5/rom.cpp", + MAME_DIR .. "src/devices/bus/m5/rom.h", + } +end + diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 0c2882df5e5..ed6378f93f8 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -10,14 +10,6 @@ --------------------------------------------------------------------------- -------------------------------------------------- --- Shared code --------------------------------------------------- - -files { - MAME_DIR .. "src/devices/cpu/vtlb.cpp", -} - --------------------------------------------------- -- Dynamic recompiler objects -------------------------------------------------- @@ -43,7 +35,6 @@ 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/vtlb.h", MAME_DIR .. "src/devices/cpu/x86emit.h", } end diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 01e61852d60..e0358285114 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -38,6 +38,18 @@ if _OPTIONS["with-bundled-lua"] then } end +if (_OPTIONS["targetos"] == "windows") then + defines { + "UI_WINDOWS", + } +end + +if (_OPTIONS["osd"] == "sdl") then + defines { + "UI_SDL", + } +end + files { MAME_DIR .. "src/emu/emu.h", MAME_DIR .. "src/emu/gamedrv.h", @@ -105,6 +117,8 @@ files { MAME_DIR .. "src/emu/distate.h", MAME_DIR .. "src/emu/divideo.cpp", MAME_DIR .. "src/emu/divideo.h", + MAME_DIR .. "src/emu/divtlb.cpp", + MAME_DIR .. "src/emu/divtlb.h", MAME_DIR .. "src/emu/drawgfx.cpp", MAME_DIR .. "src/emu/drawgfx.h", MAME_DIR .. "src/emu/drawgfxm.h", @@ -208,8 +222,6 @@ files { 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/selgame.cpp", - MAME_DIR .. "src/emu/ui/selgame.h", MAME_DIR .. "src/emu/ui/sliders.cpp", MAME_DIR .. "src/emu/ui/sliders.h", MAME_DIR .. "src/emu/ui/slotopt.cpp", @@ -222,6 +234,48 @@ files { 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", @@ -333,6 +387,7 @@ dependency { -- additional dependencies -------------------------------------------------- { MAME_DIR .. "src/emu/rendfont.cpp", GEN_DIR .. "emu/uismall.fh" }, + { MAME_DIR .. "src/emu/rendfont.cpp", GEN_DIR .. "emu/ui/uicmd14.fh" }, ------------------------------------------------- -- core layouts -------------------------------------------------- @@ -352,7 +407,8 @@ 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/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" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 5a97d22d015..fbc923b3073 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -773,6 +773,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/hp_taco.h,MACHINES["HP_TACO"] = true +--------------------------------------------------- + +if (MACHINES["HP_TACO"]~=null) then + files { + MAME_DIR .. "src/devices/machine/hp_taco.cpp", + MAME_DIR .. "src/devices/machine/hp_taco.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/i2cmem.h,MACHINES["I2CMEM"] = true --------------------------------------------------- diff --git a/scripts/src/main.lua b/scripts/src/main.lua index da633c55212..9873ba269c9 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -88,7 +88,7 @@ end targetextension ".bc" if os.getenv("EMSCRIPTEN") then postbuildcommands { - os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -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']\" $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js", + os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -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']\" $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js", } end @@ -128,7 +128,10 @@ end "jpeg", "7z", "lua", - "lsqlite3", + "lualibs", + "luv", + "uv", + "http-parser", } if _OPTIONS["with-bundled-zlib"] then @@ -166,12 +169,8 @@ end "portmidi", } end - if (USE_BGFX == 1) then - links { - "bgfx" - } - end - links{ + links { + "bgfx", "ocore_" .. _OPTIONS["osd"], } diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 87e684a50f6..ea70ca132de 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -89,7 +89,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.h", MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.h", MAME_DIR .. "src/osd/modules/opengl/osd_opengl.h", - MAME_DIR .. "src/osd/modules/opengl/SDL1211_opengl.h", } defines { "USE_OPENGL=1", @@ -101,18 +100,15 @@ function osdmodulesbuild() end end - if USE_BGFX == 1 then - files { - MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", - } - defines { - "USE_BGFX" - } - includedirs { - MAME_DIR .. "3rdparty/bgfx/include", - MAME_DIR .. "3rdparty/bx/include", - } - end + files { + MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", + MAME_DIR .. "src/osd/modules/render/binpacker.cpp", + } + includedirs { + MAME_DIR .. "3rdparty/bgfx/include", + MAME_DIR .. "3rdparty/bx/include", + MAME_DIR .. "3rdparty/rapidjson/include", + } if _OPTIONS["NO_USE_MIDI"]=="1" then defines { @@ -356,14 +352,6 @@ newoption { }, } -if not _OPTIONS["NO_OPENGL"] then - if _OPTIONS["targetos"]=="os2" then - _OPTIONS["NO_OPENGL"] = "1" - else - _OPTIONS["NO_OPENGL"] = "0" - end -end - newoption { trigger = "USE_DISPATCH_GL", description = "Use GL-dispatching", @@ -374,11 +362,7 @@ newoption { } if not _OPTIONS["USE_DISPATCH_GL"] then - if USE_BGFX == 1 then - _OPTIONS["USE_DISPATCH_GL"] = "0" - else - _OPTIONS["USE_DISPATCH_GL"] = "1" - end + _OPTIONS["USE_DISPATCH_GL"] = "0" end newoption { diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 803b7413014..b05839e7873 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -79,6 +79,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp", MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp", MAME_DIR .. "src/osd/modules/sound/none.cpp", + MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp", } project ("ocore_" .. _OPTIONS["osd"]) @@ -124,7 +125,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdmini/minidir.cpp", MAME_DIR .. "src/osd/osdmini/minifile.cpp", MAME_DIR .. "src/osd/osdmini/minimisc.cpp", - MAME_DIR .. "src/osd/osdmini/minisync.cpp", MAME_DIR .. "src/osd/osdmini/minitime.cpp", MAME_DIR .. "src/osd/modules/sync/work_mini.cpp", } diff --git a/scripts/src/osd/osdmini_cfg.lua b/scripts/src/osd/osdmini_cfg.lua index ff9539066b2..586075d3cac 100644 --- a/scripts/src/osd/osdmini_cfg.lua +++ b/scripts/src/osd/osdmini_cfg.lua @@ -7,4 +7,6 @@ defines { "USE_SDL", "SDLMAME_NOASM=1", "USE_OPENGL=0", + "NO_USE_MIDI=1", + "USE_XAUDIO2=0", } diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 6acb5a2d262..b89a25814ad 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -39,29 +39,23 @@ function maintargetosdoptions(_target,_subtarget) end if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - links { - "SDL2_ttf", - } - else - links { - "SDL_ttf", - } - end + links { + "SDL2_ttf", + } local str = backtick("pkg-config --libs fontconfig") addlibfromstring(str) addoptionsfromstring(str) end if _OPTIONS["targetos"]=="windows" then - if _OPTIONS["SDL_LIBVER"]=="sdl2" then + if _OPTIONS["USE_LIBSDL"]~="1" then links { "SDL2.dll", } else - links { - "SDL.dll", - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end links { "psapi", @@ -93,16 +87,21 @@ function maintargetosdoptions(_target,_subtarget) configuration { "mingw*" or "vs*" } targetprefix "sdl" + links { + "psapi" + } configuration { } end function sdlconfigcmd() - if not _OPTIONS["SDL_INSTALL_ROOT"] then - return _OPTIONS["SDL_LIBVER"] .. "-config" + if _OPTIONS["targetos"]=="asmjs" then + return "sdl2-config" + elseif not _OPTIONS["SDL_INSTALL_ROOT"] then + return _OPTIONS['TOOLCHAIN'] .. "pkg-config sdl2" else - return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config" + return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin","sdl2") .. "-config" end end @@ -148,23 +147,6 @@ if not _OPTIONS["NO_USE_XINPUT"] then end newoption { - trigger = "SDL_LIBVER", - description = "Choose SDL version", - allowed = { - { "sdl", "SDL" }, - { "sdl2", "SDL 2" }, - }, -} - -if not _OPTIONS["SDL_LIBVER"] then - if _OPTIONS["targetos"]=="os2" then - _OPTIONS["SDL_LIBVER"] = "sdl" - else - _OPTIONS["SDL_LIBVER"] = "sdl2" - end -end - -newoption { trigger = "SDL2_MULTIAPI", description = "Use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)", allowed = { @@ -192,16 +174,16 @@ if not _OPTIONS["SDL_FRAMEWORK_PATH"] then end newoption { - trigger = "MACOSX_USE_LIBSDL", - description = "Use SDL library on OS (rather than framework)", + trigger = "USE_LIBSDL", + description = "Use SDL library on OS (rather than framework/dll)", allowed = { - { "0", "Use framework" }, + { "0", "Use framework/dll" }, { "1", "Use library" }, }, } -if not _OPTIONS["MACOSX_USE_LIBSDL"] then - _OPTIONS["MACOSX_USE_LIBSDL"] = "0" +if not _OPTIONS["USE_LIBSDL"] then + _OPTIONS["USE_LIBSDL"] = "0" end @@ -235,10 +217,6 @@ elseif _OPTIONS["targetos"]=="os2" then SYNC_IMPLEMENTATION = "os2" end -if _OPTIONS["SDL_LIBVER"]=="sdl" then - USE_BGFX = 0 -end - if BASE_TARGETOS=="unix" then if _OPTIONS["targetos"]=="macosx" then local os_version = str_to_version(backtick("sw_vers -productVersion")) @@ -255,39 +233,27 @@ if BASE_TARGETOS=="unix" then "-weak_framework Metal", } end - if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then + if _OPTIONS["USE_LIBSDL"]~="1" then linkoptions { "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], } - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - links { - "SDL2.framework", - } - else - links { - "SDL.framework", - } - end + links { + "SDL2.framework", + } else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'") + local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'") addlibfromstring(str) addoptionsfromstring(str) end else if _OPTIONS["NO_X11"]=="1" then _OPTIONS["USE_QTDEBUG"] = "0" - USE_BGFX = 0 else libdirs { "/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib", } - if _OPTIONS["SDL_LIBVER"]=="sdl" then - links { - "X11", - } - end end local str = backtick(sdlconfigcmd() .. " --libs") addlibfromstring(str) @@ -404,13 +370,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h", MAME_DIR .. "src/osd/modules/debugger/osx/debugosx.h", } - if _OPTIONS["SDL_LIBVER"]=="sdl" then - -- SDLMain_tmpl isn't necessary for SDL2 - files { - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm", - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.h", - } - end end files { @@ -431,12 +390,10 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl/watchdog.h", MAME_DIR .. "src/osd/modules/render/drawsdl.cpp", } - if _OPTIONS["SDL_LIBVER"]=="sdl2" then - files { - MAME_DIR .. "src/osd/modules/render/draw13.cpp", - MAME_DIR .. "src/osd/modules/render/blit13.h", - } - end + files { + MAME_DIR .. "src/osd/modules/render/draw13.cpp", + MAME_DIR .. "src/osd/modules/render/blit13.h", + } project ("ocore_" .. _OPTIONS["osd"]) @@ -529,14 +486,14 @@ if _OPTIONS["with-tools"] then } if _OPTIONS["targetos"] == "windows" then - if _OPTIONS["SDL_LIBVER"] == "sdl2" then + if _OPTIONS["USE_LIBSDL"]~="1" then links { "SDL2.dll", } else - links { - "SDL.dll", - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end links { "psapi", @@ -547,12 +504,14 @@ if _OPTIONS["with-tools"] then files { MAME_DIR .. "src/osd/sdl/main.cpp", } - elseif _OPTIONS["targetos"] == "macosx" and _OPTIONS["SDL_LIBVER"] == "sdl" then - -- SDLMain_tmpl isn't necessary for SDL2 - files { - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm", - } end + + configuration { "mingw*" or "vs*" } + targetextension ".exe" + + configuration { } + + strip() end @@ -594,4 +553,6 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then files { MAME_DIR .. "src/osd/sdl/aueffectutil.mm", } + + strip() end diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 2dc1a7e465a..bdeb7274ef1 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -56,18 +56,12 @@ if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then } end -if _OPTIONS["SDL_LIBVER"]=="sdl2" then - defines { - "SDLMAME_SDL2=1", - } - if _OPTIONS["SDL2_MULTIAPI"]=="1" then - defines { - "SDL2_MULTIAPI", - } - end -else +defines { + "SDLMAME_SDL2=1", +} +if _OPTIONS["SDL2_MULTIAPI"]=="1" then defines { - "SDLMAME_SDL2=0", + "SDL2_MULTIAPI", } end @@ -81,7 +75,7 @@ if BASE_TARGETOS=="unix" then "SDLMAME_UNIX", } if _OPTIONS["targetos"]=="macosx" then - if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then + if _OPTIONS["USE_LIBSDL"]~="1" then buildoptions { "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], } @@ -151,3 +145,21 @@ elseif _OPTIONS["targetos"]=="os2" then backtick(sdlconfigcmd() .. " --cflags"), } end + +configuration { "osx*" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/osx", + } + +configuration { "freebsd" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/freebsd", + } + +configuration { "netbsd" } + includedirs { + MAME_DIR .. "3rdparty/bx/include/compat/freebsd", + } + +configuration { } + diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index fd508e645c5..54464477e24 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -159,7 +159,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", - MAME_DIR .. "src/osd/modules/render/drawdd.cpp", MAME_DIR .. "src/osd/modules/render/drawgdi.cpp", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", MAME_DIR .. "src/osd/windows/input.cpp", diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 19ef05c3ce9..3e656017816 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -50,7 +50,7 @@ end if _OPTIONS["USE_SDL"]=="1" then defines { - "SDLMAME_SDL2=0", + "SDLMAME_SDL2=1", "USE_XINPUT=0", "USE_SDL=1", "USE_SDL_SOUND", diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index 99d82fcb6cb..d30cff64df2 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -8,42 +8,78 @@ -- Rules for building tests -- --------------------------------------------------------------------------- +-------------------------------------------------- +-- GoogleTest library objects +-------------------------------------------------- -project("tests") -uuid ("66d4c639-196b-4065-a411-7ee9266564f5") -kind "ConsoleApp" +project "gtest" + uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" + kind "StaticLib" + + configuration { "gmake" } + buildoptions { + "-Wno-undef", + "-Wno-unused-variable", + } -flags { - "Symbols", -- always include minimum symbols for executables -} + configuration { "mingw-clang" } + buildoptions { + "-O0", -- crash of compiler when doing optimization + } -if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) + configuration { "vs*" } +if _OPTIONS["vs"]=="intel-15" then + buildoptions { + "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + } end -configuration { "gmake" } - buildoptions { - "-Wno-undef", + configuration { } + + includedirs { + MAME_DIR .. "3rdparty/googletest/googletest/include", + MAME_DIR .. "3rdparty/googletest/googletest", + } + files { + MAME_DIR .. "3rdparty/googletest/googletest/src/gtest-all.cc", + } + + +project("tests") + uuid ("66d4c639-196b-4065-a411-7ee9266564f5") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables } -configuration { } - -links { - "gtest", - "utils", - "expat", - "zlib", - "ocore_" .. _OPTIONS["osd"], -} - -includedirs { - MAME_DIR .. "3rdparty/googletest/googletest/include", - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", -} - -files { - MAME_DIR .. "tests/main.cpp", - MAME_DIR .. "tests/lib/util/corestr.cpp", -} + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + configuration { "gmake" } + buildoptions { + "-Wno-undef", + } + + configuration { } + + links { + "gtest", + "utils", + "expat", + "zlib", + "ocore_" .. _OPTIONS["osd"], + } + + includedirs { + MAME_DIR .. "3rdparty/googletest/googletest/include", + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", + } + + files { + MAME_DIR .. "tests/main.cpp", + MAME_DIR .. "tests/lib/util/corestr.cpp", + } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 19942651f0c..421f5cc76b5 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -50,6 +50,13 @@ files { MAME_DIR .. "src/tools/romcmp.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- chdman -------------------------------------------------- @@ -104,6 +111,13 @@ files { MAME_DIR .. "src/version.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- jedutil -------------------------------------------------- @@ -145,6 +159,13 @@ files { MAME_DIR .. "src/tools/jedutil.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- unidasm -------------------------------------------------- @@ -201,6 +222,12 @@ files { MAME_DIR .. "src/emu/emucore.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() -------------------------------------------------- -- ldresample @@ -255,6 +282,13 @@ files { MAME_DIR .. "src/tools/ldresample.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- ldverify -------------------------------------------------- @@ -308,6 +342,13 @@ files { MAME_DIR .. "src/tools/ldverify.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- regrep -------------------------------------------------- @@ -349,6 +390,13 @@ files { MAME_DIR .. "src/tools/regrep.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- srcclean --------------------------------------------------- @@ -390,6 +438,13 @@ files { MAME_DIR .. "src/tools/srcclean.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- src2html -------------------------------------------------- @@ -431,6 +486,13 @@ files { MAME_DIR .. "src/tools/src2html.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- split -------------------------------------------------- @@ -483,6 +545,13 @@ files { MAME_DIR .. "src/tools/split.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- pngcmp -------------------------------------------------- @@ -524,6 +593,13 @@ files { MAME_DIR .. "src/tools/pngcmp.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- nltool -------------------------------------------------- @@ -578,6 +654,13 @@ files { MAME_DIR .. "src/lib/netlist/prg/nltool.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- nlwav -------------------------------------------------- @@ -610,6 +693,13 @@ files { MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- castool -------------------------------------------------- @@ -664,6 +754,13 @@ files { MAME_DIR .. "src/tools/castool.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- floptool -------------------------------------------------- @@ -719,6 +816,13 @@ files { MAME_DIR .. "src/tools/floptool.cpp", } +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() + -------------------------------------------------- -- imgtool -------------------------------------------------- @@ -822,3 +926,10 @@ files { MAME_DIR .. "src/tools/imgtool/modules/bml3.cpp", MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp", } + +configuration { "mingw*" or "vs*" } + targetextension ".exe" + +configuration { } + +strip() diff --git a/scripts/src/video.lua b/scripts/src/video.lua index a09ef123fca..96a310f154b 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -156,6 +156,18 @@ end -------------------------------------------------- -- +--@src/devices/video/ef9364.h,VIDEOS["EF9364"] = true +-------------------------------------------------- + +if (VIDEOS["EF9364"]~=null) then + files { + MAME_DIR .. "src/devices/video/ef9364.cpp", + MAME_DIR .. "src/devices/video/ef9364.h", + } +end + +-------------------------------------------------- +-- --@src/devices/video/ef9365.h,VIDEOS["EF9365"] = true -------------------------------------------------- @@ -830,3 +842,15 @@ if (VIDEOS["CRTC_EGA"]~=null) then MAME_DIR .. "src/devices/video/crtc_ega.h", } end + +-------------------------------------------------- +-- +--@src/devices/video/jangou_blitter.h,VIDEOS["JANGOU_BLITTER"] = true +-------------------------------------------------- + +if (VIDEOS["JANGOU_BLITTER"]~=null) then + files { + MAME_DIR .. "src/devices/video/jangou_blitter.cpp", + MAME_DIR .. "src/devices/video/jangou_blitter.h", + } +end |