From 86d3aa80651cfe0d0599259878bc67156bf6730f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 7 Oct 2015 12:01:21 +0200
Subject: [PATCH] Moved tools in proper place, and moved build python scripts
 together with other scripts (nw)

---
 makefile                                      |  4 +-
 {src => scripts}/build/file2str.py            |  0
 {src => scripts}/build/makedep.py             |  0
 {src => scripts}/build/makelist.py            |  0
 {src => scripts}/build/png.py                 |  0
 {src => scripts}/build/png2bdc.py             |  0
 {src => scripts}/build/verinfo.py             |  0
 scripts/genie.lua                             |  6 +-
 scripts/src/emu.lua                           |  2 +-
 scripts/src/main.lua                          |  8 +-
 scripts/src/tools.lua                         | 78 +++++++++----------
 scripts/target/mame/mess.lua                  |  2 +-
 .../tools/castool/main.c => tools/castool.c}  |  0
 .../floptool/main.c => tools/floptool.c}      |  0
 src/{mame => }/tools/imgtool/charconv.c       |  0
 src/{mame => }/tools/imgtool/charconv.h       |  0
 src/{mame => }/tools/imgtool/filtbas.c        |  0
 src/{mame => }/tools/imgtool/filteoln.c       |  0
 src/{mame => }/tools/imgtool/filter.c         |  0
 src/{mame => }/tools/imgtool/filter.h         |  0
 .../tools/imgtool/formats/coco_dsk.c          |  0
 .../tools/imgtool/formats/coco_dsk.h          |  0
 src/{mame => }/tools/imgtool/formats/vt_dsk.c |  0
 src/{mame => }/tools/imgtool/formats/vt_dsk.h |  0
 src/{mame => }/tools/imgtool/iflopimg.c       |  0
 src/{mame => }/tools/imgtool/iflopimg.h       |  0
 src/{mame => }/tools/imgtool/imghd.c          |  0
 src/{mame => }/tools/imgtool/imghd.h          |  0
 src/{mame => }/tools/imgtool/imgterrs.c       |  0
 src/{mame => }/tools/imgtool/imgterrs.h       |  0
 src/{mame => }/tools/imgtool/imgtool.c        |  0
 src/{mame => }/tools/imgtool/imgtool.h        |  0
 src/{mame => }/tools/imgtool/library.c        |  0
 src/{mame => }/tools/imgtool/library.h        |  0
 src/{mame => }/tools/imgtool/main.c           |  0
 src/{mame => }/tools/imgtool/main.h           |  0
 src/{mame => }/tools/imgtool/modules.c        |  0
 src/{mame => }/tools/imgtool/modules.h        |  0
 src/{mame => }/tools/imgtool/modules/amiga.c  |  0
 src/{mame => }/tools/imgtool/modules/bml3.c   |  0
 .../tools/imgtool/modules/concept.c           |  0
 src/{mame => }/tools/imgtool/modules/cybiko.c |  0
 .../tools/imgtool/modules/cybikoxt.c          |  0
 src/{mame => }/tools/imgtool/modules/fat.c    |  0
 src/{mame => }/tools/imgtool/modules/fat.h    |  0
 src/{mame => }/tools/imgtool/modules/hp48.c   |  0
 src/{mame => }/tools/imgtool/modules/mac.c    |  0
 src/{mame => }/tools/imgtool/modules/macbin.c |  0
 .../tools/imgtool/modules/macutil.c           |  0
 .../tools/imgtool/modules/macutil.h           |  0
 src/{mame => }/tools/imgtool/modules/os9.c    |  0
 .../tools/imgtool/modules/pc_flop.c           |  0
 .../tools/imgtool/modules/pc_hard.c           |  0
 src/{mame => }/tools/imgtool/modules/prodos.c |  0
 src/{mame => }/tools/imgtool/modules/psion.c  |  0
 src/{mame => }/tools/imgtool/modules/rsdos.c  |  0
 .../tools/imgtool/modules/thomson.c           |  0
 src/{mame => }/tools/imgtool/modules/ti99.c   |  0
 .../tools/imgtool/modules/ti990hd.c           |  0
 src/{mame => }/tools/imgtool/modules/vzdos.c  |  0
 src/{mame => }/tools/imgtool/stream.c         |  0
 src/{mame => }/tools/imgtool/stream.h         |  0
 62 files changed, 50 insertions(+), 50 deletions(-)
 rename {src => scripts}/build/file2str.py (100%)
 rename {src => scripts}/build/makedep.py (100%)
 rename {src => scripts}/build/makelist.py (100%)
 rename {src => scripts}/build/png.py (100%)
 rename {src => scripts}/build/png2bdc.py (100%)
 rename {src => scripts}/build/verinfo.py (100%)
 rename src/{mame/tools/castool/main.c => tools/castool.c} (100%)
 rename src/{mame/tools/floptool/main.c => tools/floptool.c} (100%)
 rename src/{mame => }/tools/imgtool/charconv.c (100%)
 rename src/{mame => }/tools/imgtool/charconv.h (100%)
 rename src/{mame => }/tools/imgtool/filtbas.c (100%)
 rename src/{mame => }/tools/imgtool/filteoln.c (100%)
 rename src/{mame => }/tools/imgtool/filter.c (100%)
 rename src/{mame => }/tools/imgtool/filter.h (100%)
 rename src/{mame => }/tools/imgtool/formats/coco_dsk.c (100%)
 rename src/{mame => }/tools/imgtool/formats/coco_dsk.h (100%)
 rename src/{mame => }/tools/imgtool/formats/vt_dsk.c (100%)
 rename src/{mame => }/tools/imgtool/formats/vt_dsk.h (100%)
 rename src/{mame => }/tools/imgtool/iflopimg.c (100%)
 rename src/{mame => }/tools/imgtool/iflopimg.h (100%)
 rename src/{mame => }/tools/imgtool/imghd.c (100%)
 rename src/{mame => }/tools/imgtool/imghd.h (100%)
 rename src/{mame => }/tools/imgtool/imgterrs.c (100%)
 rename src/{mame => }/tools/imgtool/imgterrs.h (100%)
 rename src/{mame => }/tools/imgtool/imgtool.c (100%)
 rename src/{mame => }/tools/imgtool/imgtool.h (100%)
 rename src/{mame => }/tools/imgtool/library.c (100%)
 rename src/{mame => }/tools/imgtool/library.h (100%)
 rename src/{mame => }/tools/imgtool/main.c (100%)
 rename src/{mame => }/tools/imgtool/main.h (100%)
 rename src/{mame => }/tools/imgtool/modules.c (100%)
 rename src/{mame => }/tools/imgtool/modules.h (100%)
 rename src/{mame => }/tools/imgtool/modules/amiga.c (100%)
 rename src/{mame => }/tools/imgtool/modules/bml3.c (100%)
 rename src/{mame => }/tools/imgtool/modules/concept.c (100%)
 rename src/{mame => }/tools/imgtool/modules/cybiko.c (100%)
 rename src/{mame => }/tools/imgtool/modules/cybikoxt.c (100%)
 rename src/{mame => }/tools/imgtool/modules/fat.c (100%)
 rename src/{mame => }/tools/imgtool/modules/fat.h (100%)
 rename src/{mame => }/tools/imgtool/modules/hp48.c (100%)
 rename src/{mame => }/tools/imgtool/modules/mac.c (100%)
 rename src/{mame => }/tools/imgtool/modules/macbin.c (100%)
 rename src/{mame => }/tools/imgtool/modules/macutil.c (100%)
 rename src/{mame => }/tools/imgtool/modules/macutil.h (100%)
 rename src/{mame => }/tools/imgtool/modules/os9.c (100%)
 rename src/{mame => }/tools/imgtool/modules/pc_flop.c (100%)
 rename src/{mame => }/tools/imgtool/modules/pc_hard.c (100%)
 rename src/{mame => }/tools/imgtool/modules/prodos.c (100%)
 rename src/{mame => }/tools/imgtool/modules/psion.c (100%)
 rename src/{mame => }/tools/imgtool/modules/rsdos.c (100%)
 rename src/{mame => }/tools/imgtool/modules/thomson.c (100%)
 rename src/{mame => }/tools/imgtool/modules/ti99.c (100%)
 rename src/{mame => }/tools/imgtool/modules/ti990hd.c (100%)
 rename src/{mame => }/tools/imgtool/modules/vzdos.c (100%)
 rename src/{mame => }/tools/imgtool/stream.c (100%)
 rename src/{mame => }/tools/imgtool/stream.h (100%)

diff --git a/makefile b/makefile
index 5f5ba2a0ac8..0b7828a672f 100644
--- a/makefile
+++ b/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 $<))
 
 	
 #-------------------------------------------------
diff --git a/src/build/file2str.py b/scripts/build/file2str.py
similarity index 100%
rename from src/build/file2str.py
rename to scripts/build/file2str.py
diff --git a/src/build/makedep.py b/scripts/build/makedep.py
similarity index 100%
rename from src/build/makedep.py
rename to scripts/build/makedep.py
diff --git a/src/build/makelist.py b/scripts/build/makelist.py
similarity index 100%
rename from src/build/makelist.py
rename to scripts/build/makelist.py
diff --git a/src/build/png.py b/scripts/build/png.py
similarity index 100%
rename from src/build/png.py
rename to scripts/build/png.py
diff --git a/src/build/png2bdc.py b/scripts/build/png2bdc.py
similarity index 100%
rename from src/build/png2bdc.py
rename to scripts/build/png2bdc.py
diff --git a/src/build/verinfo.py b/scripts/build/verinfo.py
similarity index 100%
rename from src/build/verinfo.py
rename to scripts/build/verinfo.py
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 2bc58ba3116..5935b8b1bc5 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -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 {
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",
 }
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index eecbd623d84..03cfa350280 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -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")
diff --git a/src/mame/tools/castool/main.c b/src/tools/castool.c
similarity index 100%
rename from src/mame/tools/castool/main.c
rename to src/tools/castool.c
diff --git a/src/mame/tools/floptool/main.c b/src/tools/floptool.c
similarity index 100%
rename from src/mame/tools/floptool/main.c
rename to src/tools/floptool.c
diff --git a/src/mame/tools/imgtool/charconv.c b/src/tools/imgtool/charconv.c
similarity index 100%
rename from src/mame/tools/imgtool/charconv.c
rename to src/tools/imgtool/charconv.c
diff --git a/src/mame/tools/imgtool/charconv.h b/src/tools/imgtool/charconv.h
similarity index 100%
rename from src/mame/tools/imgtool/charconv.h
rename to src/tools/imgtool/charconv.h
diff --git a/src/mame/tools/imgtool/filtbas.c b/src/tools/imgtool/filtbas.c
similarity index 100%
rename from src/mame/tools/imgtool/filtbas.c
rename to src/tools/imgtool/filtbas.c
diff --git a/src/mame/tools/imgtool/filteoln.c b/src/tools/imgtool/filteoln.c
similarity index 100%
rename from src/mame/tools/imgtool/filteoln.c
rename to src/tools/imgtool/filteoln.c
diff --git a/src/mame/tools/imgtool/filter.c b/src/tools/imgtool/filter.c
similarity index 100%
rename from src/mame/tools/imgtool/filter.c
rename to src/tools/imgtool/filter.c
diff --git a/src/mame/tools/imgtool/filter.h b/src/tools/imgtool/filter.h
similarity index 100%
rename from src/mame/tools/imgtool/filter.h
rename to src/tools/imgtool/filter.h
diff --git a/src/mame/tools/imgtool/formats/coco_dsk.c b/src/tools/imgtool/formats/coco_dsk.c
similarity index 100%
rename from src/mame/tools/imgtool/formats/coco_dsk.c
rename to src/tools/imgtool/formats/coco_dsk.c
diff --git a/src/mame/tools/imgtool/formats/coco_dsk.h b/src/tools/imgtool/formats/coco_dsk.h
similarity index 100%
rename from src/mame/tools/imgtool/formats/coco_dsk.h
rename to src/tools/imgtool/formats/coco_dsk.h
diff --git a/src/mame/tools/imgtool/formats/vt_dsk.c b/src/tools/imgtool/formats/vt_dsk.c
similarity index 100%
rename from src/mame/tools/imgtool/formats/vt_dsk.c
rename to src/tools/imgtool/formats/vt_dsk.c
diff --git a/src/mame/tools/imgtool/formats/vt_dsk.h b/src/tools/imgtool/formats/vt_dsk.h
similarity index 100%
rename from src/mame/tools/imgtool/formats/vt_dsk.h
rename to src/tools/imgtool/formats/vt_dsk.h
diff --git a/src/mame/tools/imgtool/iflopimg.c b/src/tools/imgtool/iflopimg.c
similarity index 100%
rename from src/mame/tools/imgtool/iflopimg.c
rename to src/tools/imgtool/iflopimg.c
diff --git a/src/mame/tools/imgtool/iflopimg.h b/src/tools/imgtool/iflopimg.h
similarity index 100%
rename from src/mame/tools/imgtool/iflopimg.h
rename to src/tools/imgtool/iflopimg.h
diff --git a/src/mame/tools/imgtool/imghd.c b/src/tools/imgtool/imghd.c
similarity index 100%
rename from src/mame/tools/imgtool/imghd.c
rename to src/tools/imgtool/imghd.c
diff --git a/src/mame/tools/imgtool/imghd.h b/src/tools/imgtool/imghd.h
similarity index 100%
rename from src/mame/tools/imgtool/imghd.h
rename to src/tools/imgtool/imghd.h
diff --git a/src/mame/tools/imgtool/imgterrs.c b/src/tools/imgtool/imgterrs.c
similarity index 100%
rename from src/mame/tools/imgtool/imgterrs.c
rename to src/tools/imgtool/imgterrs.c
diff --git a/src/mame/tools/imgtool/imgterrs.h b/src/tools/imgtool/imgterrs.h
similarity index 100%
rename from src/mame/tools/imgtool/imgterrs.h
rename to src/tools/imgtool/imgterrs.h
diff --git a/src/mame/tools/imgtool/imgtool.c b/src/tools/imgtool/imgtool.c
similarity index 100%
rename from src/mame/tools/imgtool/imgtool.c
rename to src/tools/imgtool/imgtool.c
diff --git a/src/mame/tools/imgtool/imgtool.h b/src/tools/imgtool/imgtool.h
similarity index 100%
rename from src/mame/tools/imgtool/imgtool.h
rename to src/tools/imgtool/imgtool.h
diff --git a/src/mame/tools/imgtool/library.c b/src/tools/imgtool/library.c
similarity index 100%
rename from src/mame/tools/imgtool/library.c
rename to src/tools/imgtool/library.c
diff --git a/src/mame/tools/imgtool/library.h b/src/tools/imgtool/library.h
similarity index 100%
rename from src/mame/tools/imgtool/library.h
rename to src/tools/imgtool/library.h
diff --git a/src/mame/tools/imgtool/main.c b/src/tools/imgtool/main.c
similarity index 100%
rename from src/mame/tools/imgtool/main.c
rename to src/tools/imgtool/main.c
diff --git a/src/mame/tools/imgtool/main.h b/src/tools/imgtool/main.h
similarity index 100%
rename from src/mame/tools/imgtool/main.h
rename to src/tools/imgtool/main.h
diff --git a/src/mame/tools/imgtool/modules.c b/src/tools/imgtool/modules.c
similarity index 100%
rename from src/mame/tools/imgtool/modules.c
rename to src/tools/imgtool/modules.c
diff --git a/src/mame/tools/imgtool/modules.h b/src/tools/imgtool/modules.h
similarity index 100%
rename from src/mame/tools/imgtool/modules.h
rename to src/tools/imgtool/modules.h
diff --git a/src/mame/tools/imgtool/modules/amiga.c b/src/tools/imgtool/modules/amiga.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/amiga.c
rename to src/tools/imgtool/modules/amiga.c
diff --git a/src/mame/tools/imgtool/modules/bml3.c b/src/tools/imgtool/modules/bml3.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/bml3.c
rename to src/tools/imgtool/modules/bml3.c
diff --git a/src/mame/tools/imgtool/modules/concept.c b/src/tools/imgtool/modules/concept.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/concept.c
rename to src/tools/imgtool/modules/concept.c
diff --git a/src/mame/tools/imgtool/modules/cybiko.c b/src/tools/imgtool/modules/cybiko.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/cybiko.c
rename to src/tools/imgtool/modules/cybiko.c
diff --git a/src/mame/tools/imgtool/modules/cybikoxt.c b/src/tools/imgtool/modules/cybikoxt.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/cybikoxt.c
rename to src/tools/imgtool/modules/cybikoxt.c
diff --git a/src/mame/tools/imgtool/modules/fat.c b/src/tools/imgtool/modules/fat.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/fat.c
rename to src/tools/imgtool/modules/fat.c
diff --git a/src/mame/tools/imgtool/modules/fat.h b/src/tools/imgtool/modules/fat.h
similarity index 100%
rename from src/mame/tools/imgtool/modules/fat.h
rename to src/tools/imgtool/modules/fat.h
diff --git a/src/mame/tools/imgtool/modules/hp48.c b/src/tools/imgtool/modules/hp48.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/hp48.c
rename to src/tools/imgtool/modules/hp48.c
diff --git a/src/mame/tools/imgtool/modules/mac.c b/src/tools/imgtool/modules/mac.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/mac.c
rename to src/tools/imgtool/modules/mac.c
diff --git a/src/mame/tools/imgtool/modules/macbin.c b/src/tools/imgtool/modules/macbin.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/macbin.c
rename to src/tools/imgtool/modules/macbin.c
diff --git a/src/mame/tools/imgtool/modules/macutil.c b/src/tools/imgtool/modules/macutil.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/macutil.c
rename to src/tools/imgtool/modules/macutil.c
diff --git a/src/mame/tools/imgtool/modules/macutil.h b/src/tools/imgtool/modules/macutil.h
similarity index 100%
rename from src/mame/tools/imgtool/modules/macutil.h
rename to src/tools/imgtool/modules/macutil.h
diff --git a/src/mame/tools/imgtool/modules/os9.c b/src/tools/imgtool/modules/os9.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/os9.c
rename to src/tools/imgtool/modules/os9.c
diff --git a/src/mame/tools/imgtool/modules/pc_flop.c b/src/tools/imgtool/modules/pc_flop.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/pc_flop.c
rename to src/tools/imgtool/modules/pc_flop.c
diff --git a/src/mame/tools/imgtool/modules/pc_hard.c b/src/tools/imgtool/modules/pc_hard.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/pc_hard.c
rename to src/tools/imgtool/modules/pc_hard.c
diff --git a/src/mame/tools/imgtool/modules/prodos.c b/src/tools/imgtool/modules/prodos.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/prodos.c
rename to src/tools/imgtool/modules/prodos.c
diff --git a/src/mame/tools/imgtool/modules/psion.c b/src/tools/imgtool/modules/psion.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/psion.c
rename to src/tools/imgtool/modules/psion.c
diff --git a/src/mame/tools/imgtool/modules/rsdos.c b/src/tools/imgtool/modules/rsdos.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/rsdos.c
rename to src/tools/imgtool/modules/rsdos.c
diff --git a/src/mame/tools/imgtool/modules/thomson.c b/src/tools/imgtool/modules/thomson.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/thomson.c
rename to src/tools/imgtool/modules/thomson.c
diff --git a/src/mame/tools/imgtool/modules/ti99.c b/src/tools/imgtool/modules/ti99.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/ti99.c
rename to src/tools/imgtool/modules/ti99.c
diff --git a/src/mame/tools/imgtool/modules/ti990hd.c b/src/tools/imgtool/modules/ti990hd.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/ti990hd.c
rename to src/tools/imgtool/modules/ti990hd.c
diff --git a/src/mame/tools/imgtool/modules/vzdos.c b/src/tools/imgtool/modules/vzdos.c
similarity index 100%
rename from src/mame/tools/imgtool/modules/vzdos.c
rename to src/tools/imgtool/modules/vzdos.c
diff --git a/src/mame/tools/imgtool/stream.c b/src/tools/imgtool/stream.c
similarity index 100%
rename from src/mame/tools/imgtool/stream.c
rename to src/tools/imgtool/stream.c
diff --git a/src/mame/tools/imgtool/stream.h b/src/tools/imgtool/stream.h
similarity index 100%
rename from src/mame/tools/imgtool/stream.h
rename to src/tools/imgtool/stream.h