summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Dirk Best <mail@dirk-best.de>2015-06-10 12:28:33 +0200
committer Dirk Best <mail@dirk-best.de>2015-06-10 12:28:33 +0200
commit1c1860499f41efcf7df6fee3adda6d1557c31c35 (patch)
tree8b62e03a6b2bdc1e6f3c117bfcea7694ad0e7360
parent58e21376c9cc831b923196e00037e5048279c646 (diff)
move some legacy formats over to imgtool since it's now the only user
-rw-r--r--scripts/src/lib.lua4
-rw-r--r--scripts/src/tools.lua4
-rw-r--r--src/mess/tools/imgtool/formats/coco_dsk.c (renamed from src/lib/formats/coco_dsk.c)2
-rw-r--r--src/mess/tools/imgtool/formats/coco_dsk.h (renamed from src/lib/formats/coco_dsk.h)2
-rw-r--r--src/mess/tools/imgtool/formats/vt_dsk.c (renamed from src/lib/formats/vt_dsk.c)0
-rw-r--r--src/mess/tools/imgtool/formats/vt_dsk.h (renamed from src/lib/formats/vt_dsk.h)2
-rw-r--r--src/mess/tools/imgtool/modules/amiga.c1
7 files changed, 7 insertions, 8 deletions
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 996478276a6..d081ef6665f 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -197,8 +197,6 @@ project "formats"
MAME_DIR .. "src/lib/formats/cgenie_dsk.h",
MAME_DIR .. "src/lib/formats/coco_cas.c",
MAME_DIR .. "src/lib/formats/coco_cas.h",
- MAME_DIR .. "src/lib/formats/coco_dsk.c",
- MAME_DIR .. "src/lib/formats/coco_dsk.h",
MAME_DIR .. "src/lib/formats/comx35_dsk.c",
MAME_DIR .. "src/lib/formats/comx35_dsk.h",
MAME_DIR .. "src/lib/formats/concept_dsk.c",
@@ -402,8 +400,6 @@ project "formats"
MAME_DIR .. "src/lib/formats/vg5k_cas.h",
MAME_DIR .. "src/lib/formats/vt_cas.c",
MAME_DIR .. "src/lib/formats/vt_cas.h",
- MAME_DIR .. "src/lib/formats/vt_dsk.c",
- MAME_DIR .. "src/lib/formats/vt_dsk.h",
MAME_DIR .. "src/lib/formats/wavfile.c",
MAME_DIR .. "src/lib/formats/wavfile.h",
MAME_DIR .. "src/lib/formats/wd177x_dsk.c",
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 4f58b12d641..55f966eed2e 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -805,6 +805,10 @@ files {
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",
diff --git a/src/lib/formats/coco_dsk.c b/src/mess/tools/imgtool/formats/coco_dsk.c
index 1fa8c09ac22..9674ed9de11 100644
--- a/src/lib/formats/coco_dsk.c
+++ b/src/mess/tools/imgtool/formats/coco_dsk.c
@@ -14,7 +14,7 @@
#include "formats/coco_dsk.h"
#include "formats/basicdsk.h"
-#include "imageutl.h"
+#include "formats/imageutl.h"
#include "coretmpl.h"
/* -----------------------------------------------------------------------
diff --git a/src/lib/formats/coco_dsk.h b/src/mess/tools/imgtool/formats/coco_dsk.h
index b190390d0cc..797911d40a1 100644
--- a/src/lib/formats/coco_dsk.h
+++ b/src/mess/tools/imgtool/formats/coco_dsk.h
@@ -11,7 +11,7 @@
#ifndef COCO_DSK_H
#define COCO_DSK_H
-#include "flopimg.h"
+#include "formats/flopimg.h"
/**************************************************************************/
diff --git a/src/lib/formats/vt_dsk.c b/src/mess/tools/imgtool/formats/vt_dsk.c
index 4e75e843d28..4e75e843d28 100644
--- a/src/lib/formats/vt_dsk.c
+++ b/src/mess/tools/imgtool/formats/vt_dsk.c
diff --git a/src/lib/formats/vt_dsk.h b/src/mess/tools/imgtool/formats/vt_dsk.h
index 7b5f1fe4098..a3f9a86b44e 100644
--- a/src/lib/formats/vt_dsk.h
+++ b/src/mess/tools/imgtool/formats/vt_dsk.h
@@ -11,7 +11,7 @@
#ifndef VT_DSK_H
#define VT_DSK_H
-#include "flopimg.h"
+#include "formats/flopimg.h"
LEGACY_FLOPPY_OPTIONS_EXTERN(vz);
diff --git a/src/mess/tools/imgtool/modules/amiga.c b/src/mess/tools/imgtool/modules/amiga.c
index d0a970fae66..7723748cbd2 100644
--- a/src/mess/tools/imgtool/modules/amiga.c
+++ b/src/mess/tools/imgtool/modules/amiga.c
@@ -21,7 +21,6 @@
#include "imgtool.h"
#include "iflopimg.h"
#include "formats/imageutl.h"
-#include "formats/ami_dsk.h"