diff options
| author | 2016-06-18 17:15:17 +0200 | |
|---|---|---|
| committer | 2016-06-18 17:15:17 +0200 | |
| commit | b4beaa37b744c8b2804ff398e373e035a7e8941c (patch) | |
| tree | 93b7a1edcfb25197fce1028959f1f494fa3d461b /scripts | |
| parent | 0213201d1d902f7f166afd8f0ded227b009dfc07 (diff) | |
| parent | 1ad39fd8250863ff4c7f90e84d971db006085a17 (diff) | |
Merge remote-tracking branch 'mainline/master'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genie.lua | 15 | ||||
| -rw-r--r-- | scripts/src/3rdparty.lua | 19 | ||||
| -rw-r--r-- | scripts/src/bus.lua | 17 | ||||
| -rw-r--r-- | scripts/src/emu.lua | 1 | ||||
| -rw-r--r-- | scripts/src/lib.lua | 1 | ||||
| -rw-r--r-- | scripts/src/machine.lua | 36 | ||||
| -rw-r--r-- | scripts/src/main.lua | 20 | ||||
| -rw-r--r-- | scripts/src/mame/frontend.lua | 2 | ||||
| -rw-r--r-- | scripts/src/osd/modules.lua | 2 | ||||
| -rw-r--r-- | scripts/src/osd/windows.lua | 2 | ||||
| -rw-r--r-- | scripts/src/tests.lua | 4 | ||||
| -rw-r--r-- | scripts/src/tools.lua | 2 | ||||
| -rw-r--r-- | scripts/target/mame/arcade.lua | 11 | ||||
| -rw-r--r-- | scripts/target/mame/mess.lua | 8 | ||||
| -rw-r--r-- | scripts/toolchain.lua | 2 |
15 files changed, 93 insertions, 49 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 95bb6dba6af..5eebe355e2c 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -350,15 +350,6 @@ newoption { } newoption { - trigger = "IGNORE_GIT", - description = "Ignore usage of git command in build process", - allowed = { - { "0", "Do not ignore" }, - { "1", "Ingore" }, - }, -} - -newoption { trigger = "SOURCES", description = "List of sources to compile.", } @@ -521,7 +512,7 @@ if (_OPTIONS["SOURCES"] == nil) then dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua")) end -configuration { "gmake" } +configuration { "gmake or ninja" } flags { "SingleOutputDir", } @@ -681,7 +672,7 @@ end "LUA_COMPAT_5_2", } - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "ninja" then --we compile C-only to C99 standard with GNU extensions @@ -714,7 +705,7 @@ end -- this speeds it up a bit by piping between the preprocessor/compiler/assembler if not ("pnacl" == _OPTIONS["gcc"]) then buildoptions { - "--pipe", + "-pipe", } end -- add -g if we need symbols, and ensure we have frame pointers diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 484e13c1de0..d8e6c9e2fff 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -88,7 +88,7 @@ project "zlib" local version = str_to_version(_OPTIONS["gcc_version"]) 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" } + configuration { "gmake or ninja" } if (version >= 30700) then buildoptions { "-Wno-shift-negative-value", @@ -113,7 +113,7 @@ end "verbose=-1", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", } @@ -299,7 +299,7 @@ end "HAVE_CONFIG_H=1", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-unused-function", "-O0", @@ -352,7 +352,7 @@ project "7z" uuid "ad573d62-e76a-4b11-ae34-5110a6789a42" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-undef", "-Wno-strict-prototypes", @@ -446,7 +446,7 @@ project "lua" -- "ForceCPP", --} - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-bad-function-cast" } @@ -717,7 +717,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-uninitialized", "-Wno-unused-function", @@ -795,15 +795,12 @@ end 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 @@ -845,7 +842,7 @@ end -- "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration -- } -- --- configuration { "gmake" } +-- configuration { "gmake or ninja" } -- buildoptions_c { -- "-Wno-strict-prototypes", -- "-Wno-bad-function-cast", @@ -982,7 +979,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/win", } - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 5b6cd19f659..571c75fd48b 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1092,6 +1092,23 @@ end --------------------------------------------------- -- +--@src/devices/bus/pofo/exp.h,BUSES["POFO"] = true +--------------------------------------------------- + +if (BUSES["POFO"]~=null) then + files { + MAME_DIR .. "src/devices/bus/pofo/exp.cpp", + MAME_DIR .. "src/devices/bus/pofo/exp.h", + MAME_DIR .. "src/devices/bus/pofo/hpc101.cpp", + MAME_DIR .. "src/devices/bus/pofo/hpc101.h", + MAME_DIR .. "src/devices/bus/pofo/hpc102.cpp", + MAME_DIR .. "src/devices/bus/pofo/hpc102.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/s100/s100.h,BUSES["S100"] = true --------------------------------------------------- diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 2449faa0ae5..a446a6ccaae 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -33,6 +33,7 @@ includedirs { ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("flac"), + ext_includedir("jpeg"), } files { diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 77f6f4344dd..2352dd6a3a3 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -80,7 +80,6 @@ project "utils" 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", MAME_DIR .. "src/lib/util/unzip.cpp", diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 1d061199208..7ddf031d76d 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1178,6 +1178,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/ldp1000.h,MACHINES["LDP1000"] = true +--------------------------------------------------- + +if (MACHINES["LDP1000"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ldp1000.cpp", + MAME_DIR .. "src/devices/machine/ldp1000.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/ldvp931.h,MACHINES["LDVP931"] = true --------------------------------------------------- @@ -2034,6 +2046,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/scnxx562.h,MACHINES["DUSCC"] = true +--------------------------------------------------- + +if (MACHINES["DUSCC"]~=null) then + files { + MAME_DIR .. "src/devices/machine/scnxx562.cpp", + MAME_DIR .. "src/devices/machine/scnxx562.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/serflash.h,MACHINES["SERFLASH"] = true --------------------------------------------------- @@ -2856,6 +2880,7 @@ if (MACHINES["APPLE_FDC"]~=null) then MAME_DIR .. "src/devices/machine/applefdc.h", } end + --------------------------------------------------- -- --@src/devices/machine/sonydriv.h,MACHINES["SONY_DRIVE"] = true @@ -2866,3 +2891,14 @@ if (MACHINES["SONY_DRIVE"]~=null) then MAME_DIR .. "src/devices/machine/sonydriv.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/scnxx562.h,MACHINES["SCNXX562"] = true +--------------------------------------------------- +if (MACHINES["SCNXX562"]~=null) then + files { + MAME_DIR .. "src/devices/machine/scnxx562.cpp", + MAME_DIR .. "src/devices/machine/scnxx562.h", + } +end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index d5cce436dce..42615bedebb 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -147,17 +147,7 @@ end end configuration { } - -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", @@ -277,7 +267,7 @@ if (STANDALONE~=true) then "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist" } custombuildtask { - { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }}, + { GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }}, } dependency { { "$(TARGET)" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", true }, @@ -312,7 +302,7 @@ if (STANDALONE~=true) then end files { mainfile, - MAME_DIR .. "src/version.cpp", + GEN_DIR .. "version.cpp", GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", } @@ -355,14 +345,14 @@ if (STANDALONE~=true) then configuration { "mingw*" } 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 .. " $(<) > $(@)" }}, + { GEN_DIR .. "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 { "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", "\\") , + PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(GEN_DIR .. "version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , } end diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua index ea9bb933cfc..e35bed2da07 100644 --- a/scripts/src/mame/frontend.lua +++ b/scripts/src/mame/frontend.lua @@ -75,6 +75,8 @@ files { 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/text.cpp", + MAME_DIR .. "src/frontend/mame/ui/text.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", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 5fb1d23c1bc..b8e5bb61b83 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -244,7 +244,7 @@ function qtdebuggerbuild() } 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" } + configuration { "gmake or ninja" } if (version >= 30600) then buildoptions { "-Wno-inconsistent-missing-override", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 8b48b8f0771..9307c6dec71 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -154,8 +154,6 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - 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", diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index b5bb5b37366..e0a8da88d75 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -16,7 +16,7 @@ project "gtest" uuid "fa306a8d-fb10-4d4a-9d2e-fdb9076407b4" kind "StaticLib" - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-undef", "-Wno-unused-variable", @@ -52,7 +52,7 @@ project("mametests") targetdir(MAME_DIR) end - configuration { "gmake" } + configuration { "gmake or ninja" } buildoptions { "-Wno-undef", } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index a2e5ad73496..87192f53d5b 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -87,7 +87,7 @@ includedirs { files { MAME_DIR .. "src/tools/chdman.cpp", MAME_DIR .. "src/emu/emucore.cpp", - MAME_DIR .. "src/version.cpp", + GEN_DIR .. "version.cpp", } configuration { "mingw*" or "vs*" } diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index b2d06ebc5b6..8496640ed76 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -429,6 +429,7 @@ MACHINES["LC89510"] = true MACHINES["LDPR8210"] = true MACHINES["LDSTUB"] = true MACHINES["LDV1000"] = true +MACHINES["LDP1000"] = true MACHINES["LDVP931"] = true --MACHINES["LH5810"] = true MACHINES["LINFLASH"] = true @@ -1168,6 +1169,8 @@ files { MAME_DIR .. "src/mame/machine/mathbox.cpp", MAME_DIR .. "src/mame/machine/mathbox.h", MAME_DIR .. "src/mame/machine/slapstic.cpp", + MAME_DIR .. "src/mame/machine/atarixga.cpp", + MAME_DIR .. "src/mame/machine/atarixga.h", MAME_DIR .. "src/mame/audio/atarijsa.cpp", MAME_DIR .. "src/mame/audio/atarijsa.h", MAME_DIR .. "src/mame/audio/cage.cpp", @@ -2114,6 +2117,9 @@ files { MAME_DIR .. "src/mame/drivers/ddribble.cpp", MAME_DIR .. "src/mame/includes/ddribble.h", MAME_DIR .. "src/mame/video/ddribble.cpp", + MAME_DIR .. "src/mame/drivers/divebomb.cpp", + MAME_DIR .. "src/mame/includes/divebomb.h", + MAME_DIR .. "src/mame/video/divebomb.cpp", MAME_DIR .. "src/mame/drivers/djmain.cpp", MAME_DIR .. "src/mame/includes/djmain.h", MAME_DIR .. "src/mame/video/djmain.cpp", @@ -4220,6 +4226,11 @@ files { -------------------------------------------------- createMAMEProjects(_target, _subtarget, "misc") + +includedirs { + ext_includedir("jpeg"), +} + files { MAME_DIR .. "src/mame/drivers/1945kiii.cpp", MAME_DIR .. "src/mame/drivers/39in1.cpp", diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index d43417a7404..76b52c9f669 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -584,6 +584,7 @@ MACHINES["SMARTMEDIA"] = true MACHINES["APPLE_DRIVE"] = true MACHINES["APPLE_FDC"] = true MACHINES["SONY_DRIVE"] = true +MACHINES["SCNXX562"] = true -------------------------------------------------- -- specify available bus cores @@ -655,6 +656,7 @@ BUSES["PC_JOY"] = true BUSES["PC_KBD"] = true BUSES["PET"] = true BUSES["PLUS4"] = true +BUSES["POFO"] = true BUSES["PSX_CONTROLLER"] = true BUSES["QL"] = true BUSES["RS232"] = true @@ -1306,8 +1308,7 @@ files { MAME_DIR .. "src/mame/audio/lynx.cpp", MAME_DIR .. "src/mame/audio/lynx.h", MAME_DIR .. "src/mame/machine/lynx.cpp", - MAME_DIR .. "src/mame/drivers/portfoli.cpp", - MAME_DIR .. "src/mame/includes/portfoli.h", + MAME_DIR .. "src/mame/drivers/pofo.cpp", } createMESSProjects(_target, _subtarget, "att") @@ -1727,6 +1728,7 @@ files { createMESSProjects(_target, _subtarget, "force") files { + MAME_DIR .. "src/mame/drivers/fccpu30.cpp", MAME_DIR .. "src/mame/drivers/force68k.cpp", } @@ -2900,7 +2902,7 @@ files { createMESSProjects(_target, _subtarget, "usp") files { MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", - MAME_DIR .. "src/mame/includes/patinho_feio.h", + MAME_DIR .. "src/mame/includes/patinhofeio.h", } createMESSProjects(_target, _subtarget, "veb") diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 8536845c266..6046b4d97d8 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -109,7 +109,7 @@ function toolchain(_buildDir, _subDir) windowsPlatform = _OPTIONS["with-windows"] end - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "ninja" then if nil == _OPTIONS["gcc"] or nil == _OPTIONS["gcc_version"] then print("GCC flavor and version must be specified!") |
