diff options
author | 2015-10-07 12:01:21 +0200 | |
---|---|---|
committer | 2015-10-07 12:01:21 +0200 | |
commit | 86d3aa80651cfe0d0599259878bc67156bf6730f (patch) | |
tree | 1d523e71e2e77e906b3a59cf3f2c9fd1c2d9f7c0 /scripts/src | |
parent | a0f6b5e59a6d691572906367809d969d133d2abc (diff) |
Moved tools in proper place, and moved build python scripts together with other scripts (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/emu.lua | 2 | ||||
-rw-r--r-- | scripts/src/main.lua | 8 | ||||
-rw-r--r-- | scripts/src/tools.lua | 78 |
3 files changed, 44 insertions, 44 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 547c57e2791..b785affd06e 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -342,7 +342,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..97c213b4620 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -184,7 +184,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 }, @@ -232,7 +232,7 @@ if (_OPTIONS["DRIVERS"] == nil) then { "../../../../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 +245,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 ec3d78c791b..fc095e3d31d 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -709,7 +709,7 @@ includedirs { } files { - MAME_DIR .. "src/mame/tools/castool/main.c", + MAME_DIR .. "src/tools/castool.c", } -------------------------------------------------- @@ -768,7 +768,7 @@ includedirs { } files { - MAME_DIR .. "src/mame/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/mame/tools/imgtool", + MAME_DIR .. "src/tools/imgtool", } files { - MAME_DIR .. "src/mame/tools/imgtool/main.c", - MAME_DIR .. "src/mame/tools/imgtool/stream.c", - MAME_DIR .. "src/mame/tools/imgtool/library.c", - MAME_DIR .. "src/mame/tools/imgtool/modules.c", - MAME_DIR .. "src/mame/tools/imgtool/iflopimg.c", - MAME_DIR .. "src/mame/tools/imgtool/filter.c", - MAME_DIR .. "src/mame/tools/imgtool/filteoln.c", - MAME_DIR .. "src/mame/tools/imgtool/filtbas.c", - MAME_DIR .. "src/mame/tools/imgtool/imgtool.c", - MAME_DIR .. "src/mame/tools/imgtool/imgterrs.c", - MAME_DIR .. "src/mame/tools/imgtool/imghd.c", - MAME_DIR .. "src/mame/tools/imgtool/charconv.c", - MAME_DIR .. "src/mame/tools/imgtool/formats/vt_dsk.c", - MAME_DIR .. "src/mame/tools/imgtool/formats/vt_dsk.h", - MAME_DIR .. "src/mame/tools/imgtool/formats/coco_dsk.c", - MAME_DIR .. "src/mame/tools/imgtool/formats/coco_dsk.h", - MAME_DIR .. "src/mame/tools/imgtool/modules/amiga.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/macbin.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/rsdos.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/os9.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/mac.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/ti99.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/ti990hd.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/concept.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/fat.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/pc_flop.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/pc_hard.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/prodos.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/vzdos.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/thomson.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/macutil.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/cybiko.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/cybikoxt.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/psion.c", - MAME_DIR .. "src/mame/tools/imgtool/modules/bml3.c", - MAME_DIR .. "src/mame/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", } |