Moved tools in proper place, and moved build python scripts together with other scripts (nw)
Miodrag Milanovic
parent
a0f6b5e59a
commit
86d3aa8065
4
makefile
4
makefile
|
|
@ -1097,9 +1097,9 @@ generate: \
|
|||
$(GEN_FOLDERS) \
|
||||
$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS))
|
||||
|
||||
$(GENDIR)/%.lh: $(SRC)/%.lay $(SRC)/build/file2str.py
|
||||
$(GENDIR)/%.lh: $(SRC)/%.lay scripts/build/file2str.py
|
||||
@echo Converting $<...
|
||||
$(SILENT)$(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
|
||||
$(SILENT)$(PYTHON) scripts/build/file2str.py $< $@ layout_$(basename $(notdir $<))
|
||||
|
||||
|
||||
#-------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ end
|
|||
|
||||
function layoutbuildtask(_folder, _name)
|
||||
return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" , GEN_DIR .. _folder .. "/".._name..".lh",
|
||||
{ MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", PYTHON .. " $(1) $(<) $(@) layout_".._name }};
|
||||
{ MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", PYTHON .. " $(1) $(<) $(@) layout_".._name }};
|
||||
end
|
||||
|
||||
CPUS = {}
|
||||
|
|
@ -522,9 +522,9 @@ if (_OPTIONS["DRIVERS"] == nil) then
|
|||
end
|
||||
dofile (path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
|
||||
else
|
||||
OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "src/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " target " .. _OPTIONS["subtarget"])
|
||||
OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " target " .. _OPTIONS["subtarget"])
|
||||
load(OUT_STR)()
|
||||
os.outputof( PYTHON .. " " .. MAME_DIR .. "src/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.c")
|
||||
os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["DRIVERS"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.c")
|
||||
end
|
||||
configuration { "gmake" }
|
||||
flags {
|
||||
|
|
|
|||
|
|
@ -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"),
|
||||
|
|
|
|||
|
|
@ -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", "\\") ,
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2582,7 +2582,7 @@ dependency {
|
|||
{ MAME_DIR .. "src/mame/drivers/ymmu100.c", GEN_DIR .. "mame/drivers/ymmu100.inc" },
|
||||
}
|
||||
custombuildtask {
|
||||
{ MAME_DIR .. "src/mame/drivers/ymmu100.ppm", GEN_DIR .. "mame/drivers/ymmu100.inc", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", PYTHON .. " $(1) $(<) $(@) ymmu100_bkg UINT8" }},
|
||||
{ MAME_DIR .. "src/mame/drivers/ymmu100.ppm", GEN_DIR .. "mame/drivers/ymmu100.inc", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", PYTHON .. " $(1) $(<) $(@) ymmu100_bkg UINT8" }},
|
||||
}
|
||||
|
||||
createMESSProjects(_target, _subtarget, "zenith")
|
||||
|
|
|
|||
Loading…
Reference in New Issue