Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 04:43:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better fix for vt_dsk.h header name clash

Browse Source
This commit is contained in:
AJR 2021-05-26 14:39:05 -04:00
parent 7026e4ceaa
commit c7d7b25caa
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/src/tools.lua
View File

@ -679,8 +679,8 @@ files {
MAME_DIR .. "src/tools/imgtool/imghd.h",
MAME_DIR .. "src/tools/imgtool/charconv.cpp",
MAME_DIR .. "src/tools/imgtool/charconv.h",
MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp",
MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h",
MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.cpp",
MAME_DIR .. "src/tools/imgtool/formats/vt_dsk_legacy.h",
MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp",
MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h",
MAME_DIR .. "src/tools/imgtool/formats/pc_dsk_legacy.cpp",

8
src/tools/imgtool/formats/vt_dsk.cpp → src/tools/imgtool/formats/vt_dsk_legacy.cpp
View File

@ -2,16 +2,16 @@
// copyright-holders:Juergen Buchmueller
/*********************************************************************
formats/vt_dsk.c
formats/vt_dsk_legacy.cpp
VTech Laser/VZ disk images
VTech Laser/VZ disk images (legacy support)
*********************************************************************/
#include <cstdio>
#include <cstring>
#include <cassert>
#include "formats/vt_dsk.h"
#include "formats/vt_dsk_legacy.h"
#include "formats/basicdsk.h"
static FLOPPY_IDENTIFY(vz_identify)
@ -47,7 +47,7 @@ static FLOPPY_CONSTRUCT(vz_construct)
}
extern LEGACY_FLOPPY_OPTIONS_START(vz)
LEGACY_FLOPPY_OPTIONS_START(vz)
LEGACY_FLOPPY_OPTION(vtech1, "dsk", "Laser/VZ disk image", vz_identify, vz_construct, NULL,
HEADS([1])
TRACKS([40])

10
src/tools/imgtool/formats/vt_dsk.h → src/tools/imgtool/formats/vt_dsk_legacy.h
View File

@ -2,17 +2,17 @@
// copyright-holders:Juergen Buchmueller
/*********************************************************************
formats/vt_dsk.h
formats/vt_dsk_legacy.h
Tandy Color Computer / Dragon disk images
VTech Laser/VZ disk images (legacy support)
*********************************************************************/
#ifndef VT_DSK_H
#define VT_DSK_H
#ifndef VT_DSK_LEGACY_H
#define VT_DSK_LEGACY_H
#include "formats/flopimg.h"
LEGACY_FLOPPY_OPTIONS_EXTERN(vz);
#endif /* VT_DSK_H */
#endif /* VT_DSK_LEGACY_H */

2
src/tools/imgtool/modules/vzdos.cpp
View File

@ -14,7 +14,7 @@
#include <cmath>
#include "imgtool.h"
#include "formats/imageutl.h"
#include "formats/vt_dsk.h"
#include "formats/vt_dsk_legacy.h"
#include "iflopimg.h"
/*