diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 2 | ||||
-rw-r--r-- | scripts/src/bus.lua | 21 | ||||
-rw-r--r-- | scripts/src/devices.lua | 8 | ||||
-rw-r--r-- | scripts/src/emu.lua | 2 | ||||
-rw-r--r-- | scripts/src/main.lua | 22 | ||||
-rw-r--r-- | scripts/src/tools.lua | 78 |
6 files changed, 79 insertions, 54 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 3fef7c5ea23..bbe07a80b9a 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -645,7 +645,7 @@ project "bgfx" MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp", - MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", + --MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp", } diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 064f8503156..a07da201d35 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1101,6 +1101,23 @@ end --------------------------------------------------- -- +--@src/devices/bus/tiki100/exp.h,BUSES["TIKI100"] = true +--------------------------------------------------- + +if (BUSES["TIKI100"]~=null) then + files { + MAME_DIR .. "src/devices/bus/tiki100/exp.c", + MAME_DIR .. "src/devices/bus/tiki100/exp.h", + MAME_DIR .. "src/devices/bus/tiki100/8088.c", + MAME_DIR .. "src/devices/bus/tiki100/8088.h", + MAME_DIR .. "src/devices/bus/tiki100/hdc.c", + MAME_DIR .. "src/devices/bus/tiki100/hdc.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/tvc/tvc.h,BUSES["TVC"] = true --------------------------------------------------- @@ -2020,10 +2037,10 @@ if (BUSES["TI99X"]~=null) then MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h", MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h", MAME_DIR .. "src/devices/bus/ti99x/videowrp.c", - MAME_DIR .. "src/devices/bus/ti99x/videowrp.h", + MAME_DIR .. "src/devices/bus/ti99x/videowrp.h", } end - + --------------------------------------------------- -- --@src/devices/bus/ti99_peb/peribox.h,BUSES["TI99PEB"] = true diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index a7dc3c69367..c46d0db8427 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -47,7 +47,7 @@ function devicesProject(_target, _subtarget) dofile(path.join("src", "machine.lua")) -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then project ("bus") uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d") kind (LIBTYPE) @@ -65,8 +65,7 @@ if (_OPTIONS["DRIVERS"] == nil) then MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "src/mess", -- some mess bus devices need this - MAME_DIR .. "src/mame", -- used for nes bus devices + MAME_DIR .. "src/mame", -- used for nes bus devices,some mess bus devices need this GEN_DIR .. "emu", GEN_DIR .. "emu/layout", } @@ -86,6 +85,7 @@ else dofile(path.join("src", "bus.lua")) end +if #disasm_files > 0 then project ("dasm") uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d") kind (LIBTYPE) @@ -130,3 +130,5 @@ end } end end + +end diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 5187f87b71a..eded02ed368 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -346,7 +346,7 @@ dependency { } custombuildtask { - { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "src/build/png2bdc.py", MAME_DIR .. "src/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" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 8baa4adbd7c..d4d991dcdfa 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -2,7 +2,7 @@ -- copyright-holders:MAMEdev Team function mainProject(_target, _subtarget) -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (_target == _subtarget) then project (_target) else @@ -38,7 +38,7 @@ end flags { "Unicode", } -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then configuration { "x64", "Release" } targetsuffix "64" if _OPTIONS["PROFILE"] then @@ -91,7 +91,7 @@ end links { "osd_" .. _OPTIONS["osd"], } - if (_OPTIONS["DRIVERS"] == nil) then + if (_OPTIONS["SOURCES"] == nil) then links { "bus", } @@ -101,7 +101,13 @@ end "optional", "emu", "formats", + } +if #disasm_files > 0 then + links { "dasm", + } +end + links { "utils", "expat", "softfloat", @@ -184,7 +190,7 @@ end "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist" } custombuildtask { - { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }}, + { MAME_DIR .. "src/version.c" , 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 }, @@ -226,13 +232,13 @@ end GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", } -if (_OPTIONS["DRIVERS"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then dependency { { "../../../../generated/mame/mame/drivlist.c", MAME_DIR .. "src/mame/mess.lst", true }, { "../../../../generated/mame/mame/drivlist.c" , MAME_DIR .. "src/mame/arcade.lst", true}, } custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, } end @@ -245,14 +251,14 @@ if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then end configuration { "mingw*" } custombuildtask { - { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }}, + { MAME_DIR .. "src/version.c" , 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 .. "src/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", "\\") , + PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", "\\") , } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 86473380a33..fc095e3d31d 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -709,7 +709,7 @@ includedirs { } files { - MAME_DIR .. "src/mess/tools/castool/main.c", + MAME_DIR .. "src/tools/castool.c", } -------------------------------------------------- @@ -768,7 +768,7 @@ includedirs { } files { - MAME_DIR .. "src/mess/tools/floptool/main.c", + MAME_DIR .. "src/tools/floptool.c", } -------------------------------------------------- @@ -825,44 +825,44 @@ includedirs { MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty/zlib", - MAME_DIR .. "src/mess/tools/imgtool", + MAME_DIR .. "src/tools/imgtool", } files { - MAME_DIR .. "src/mess/tools/imgtool/main.c", - MAME_DIR .. "src/mess/tools/imgtool/stream.c", - MAME_DIR .. "src/mess/tools/imgtool/library.c", - MAME_DIR .. "src/mess/tools/imgtool/modules.c", - MAME_DIR .. "src/mess/tools/imgtool/iflopimg.c", - MAME_DIR .. "src/mess/tools/imgtool/filter.c", - MAME_DIR .. "src/mess/tools/imgtool/filteoln.c", - MAME_DIR .. "src/mess/tools/imgtool/filtbas.c", - MAME_DIR .. "src/mess/tools/imgtool/imgtool.c", - MAME_DIR .. "src/mess/tools/imgtool/imgterrs.c", - MAME_DIR .. "src/mess/tools/imgtool/imghd.c", - MAME_DIR .. "src/mess/tools/imgtool/charconv.c", - MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.c", - MAME_DIR .. "src/mess/tools/imgtool/formats/vt_dsk.h", - MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.c", - MAME_DIR .. "src/mess/tools/imgtool/formats/coco_dsk.h", - MAME_DIR .. "src/mess/tools/imgtool/modules/amiga.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/macbin.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/rsdos.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/os9.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/mac.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/ti99.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/ti990hd.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/concept.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/fat.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/pc_flop.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/pc_hard.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/prodos.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/vzdos.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/thomson.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/macutil.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/cybiko.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/cybikoxt.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/psion.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/bml3.c", - MAME_DIR .. "src/mess/tools/imgtool/modules/hp48.c", + MAME_DIR .. "src/tools/imgtool/main.c", + MAME_DIR .. "src/tools/imgtool/stream.c", + MAME_DIR .. "src/tools/imgtool/library.c", + MAME_DIR .. "src/tools/imgtool/modules.c", + MAME_DIR .. "src/tools/imgtool/iflopimg.c", + MAME_DIR .. "src/tools/imgtool/filter.c", + MAME_DIR .. "src/tools/imgtool/filteoln.c", + MAME_DIR .. "src/tools/imgtool/filtbas.c", + MAME_DIR .. "src/tools/imgtool/imgtool.c", + MAME_DIR .. "src/tools/imgtool/imgterrs.c", + MAME_DIR .. "src/tools/imgtool/imghd.c", + MAME_DIR .. "src/tools/imgtool/charconv.c", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.c", + MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.c", + MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", + MAME_DIR .. "src/tools/imgtool/modules/amiga.c", + MAME_DIR .. "src/tools/imgtool/modules/macbin.c", + MAME_DIR .. "src/tools/imgtool/modules/rsdos.c", + MAME_DIR .. "src/tools/imgtool/modules/os9.c", + MAME_DIR .. "src/tools/imgtool/modules/mac.c", + MAME_DIR .. "src/tools/imgtool/modules/ti99.c", + MAME_DIR .. "src/tools/imgtool/modules/ti990hd.c", + MAME_DIR .. "src/tools/imgtool/modules/concept.c", + MAME_DIR .. "src/tools/imgtool/modules/fat.c", + MAME_DIR .. "src/tools/imgtool/modules/pc_flop.c", + MAME_DIR .. "src/tools/imgtool/modules/pc_hard.c", + MAME_DIR .. "src/tools/imgtool/modules/prodos.c", + MAME_DIR .. "src/tools/imgtool/modules/vzdos.c", + MAME_DIR .. "src/tools/imgtool/modules/thomson.c", + MAME_DIR .. "src/tools/imgtool/modules/macutil.c", + MAME_DIR .. "src/tools/imgtool/modules/cybiko.c", + MAME_DIR .. "src/tools/imgtool/modules/cybikoxt.c", + MAME_DIR .. "src/tools/imgtool/modules/psion.c", + MAME_DIR .. "src/tools/imgtool/modules/bml3.c", + MAME_DIR .. "src/tools/imgtool/modules/hp48.c", } |