Description: Don't try to include tools stripped from the source Author: Stephen Kitt Forwarded: not-needed DOSBox-X upstream includes a number of DOS tools which can't be distributed in Debian; these are removed from the source archive, and this patch fixes the build accordingly. --- a/include/builtin.h +++ b/include/builtin.h @@ -1,43 +1,11 @@ #include "dos_inc.h" -#include "../src/builtin/zip.h" -#include "../src/builtin/eval.h" -#include "../src/builtin/cdplay.h" -#include "../src/builtin/dosmid.h" -#include "../src/builtin/mpxplay.h" -#include "../src/builtin/ne2000bin.h" -#include "../src/builtin/glide2x.h" -#include "../src/builtin/emsmagic.h" -#include "../src/builtin/shutdown.h" #include "../src/builtin/textutil.h" -#include "../src/builtin/4DOS_img.h" extern char i4dos_data[CONFIG_SIZE]; extern char config_data[CONFIG_SIZE]; extern char autoexec_data[AUTOEXEC_SIZE]; -extern struct BuiltinFileBlob bfb_DSXMENU_EXE_PC; // DSXMENU.EXE -extern struct BuiltinFileBlob bfb_DSXMENU_EXE_PC98; // DSXMENU.EXE - -extern struct BuiltinFileBlob bfb_CWSDPMI_PC98_EXE; // CWSDPMI.EXE (PC-98 version) -extern struct BuiltinFileBlob bfb_CWSDPMI_EXE; // CWSDPMI.EXE -extern struct BuiltinFileBlob bfb_DOS32A_EXE; // DOS32A.EXE -extern struct BuiltinFileBlob bfb_DOS4GW_EXE; // DOS4GW.EXE -extern struct BuiltinFileBlob bfb_DOSIDLE_EXE; // DOSIDLE.EXE -extern struct BuiltinFileBlob bfb_HEXMEM16_EXE; // HEXMEM16.EXE -extern struct BuiltinFileBlob bfb_HEXMEM32_EXE; // HEXMEM32.EXE -extern struct BuiltinFileBlob bfb_REPLACE_EXE; // REPLACE.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_SORT_EXE; // SORT.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_MOVE_EXE; // MOVE.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_MEM_EXE; // MEM.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_MEM_EXE_PC98; // MEM.EXE (FreeDOS) https://github.com/lpproj/mem.nec -extern struct BuiltinFileBlob bfb_FIND_EXE; // FIND.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_DEBUG_EXE; // DEBUG.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_PRINT_COM; // PRINT.COM (FreeDOS) -extern struct BuiltinFileBlob bfb_XCOPY_EXE; // XCOPY.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_APPEND_EXE; // APPEND.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_EDLIN_EXE; // EDLIN.EXE (FreeDOS) -extern struct BuiltinFileBlob bfb_EDIT_COM; // EDIT.COM extern struct BuiltinFileBlob bfb_DEVICE_COM; // DEVICE.COM extern struct BuiltinFileBlob bfb_BUFFERS_COM; // BUFFERS.COM extern struct BuiltinFileBlob bfb_LASTDRIV_COM; // LASTDRIV.COM @@ -53,18 +21,6 @@ extern struct BuiltinFileBlob bfb_25_COM_ega; // 25.COM extern struct BuiltinFileBlob bfb_25_COM_other; // 25.COM extern struct BuiltinFileBlob bfb_50_COM; // 50.COM -extern struct BuiltinFileBlob bfb_4DOS_COM; // 4DOS.COM -extern struct BuiltinFileBlob bfb_4DOS_HLP; // 4DOS.HLP -extern struct BuiltinFileBlob bfb_4HELP_EXE; // 4HELP.EXE -extern struct BuiltinFileBlob bfb_BATCOMP_EXE; // BATCOM.EXE -extern struct BuiltinFileBlob bfb_EXAMPLES_BTM; // EXAMPLES.BTM -extern struct BuiltinFileBlob bfb_LICENSE_TXT; // LICENSE.TXT -extern struct BuiltinFileBlob bfb_OPTION_EXE; // OPTION.EXE -extern struct BuiltinFileBlob bfb_CDPLAY_EXE; // CDPLAY.EXE -extern struct BuiltinFileBlob bfb_DOSMID_EXE; // DOSMID.EXE -extern struct BuiltinFileBlob bfb_MPXPLAY_EXE; // MPXPLAY.EXE -extern struct BuiltinFileBlob bfb_NE2000_COM; // NE2000.COM -extern struct BuiltinFileBlob bfb_GLIDE2X_OVL; // GLIDE2X.OVL extern struct BuiltinFileBlob bfb_VGA_COM; // VGA.COM extern struct BuiltinFileBlob bfb_EGA_COM; // EGA.COM extern struct BuiltinFileBlob bfb_CLR_COM; // CLR.COM --- a/src/dos/dos_programs.cpp +++ b/src/dos/dos_programs.cpp @@ -9471,66 +9471,9 @@ if (IS_DOSV) PROGRAMS_MakeFile("VTEXT.COM", VTEXT_ProgramStart,"/TEXTUTIL/"); - VFILE_RegisterBuiltinFileBlob(bfb_EDLIN_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_DEBUG_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_MOVE_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_FIND_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_FCBS_COM, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_FILES_COM, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_LASTDRIV_COM, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_REPLACE_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_SORT_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_XCOPY_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_APPEND_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_DEVICE_COM, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_BUFFERS_COM, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_CHKDSK_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_COMP_COM, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_FC_EXE, "/DOS/"); #if C_IPX if (addipx) PROGRAMS_MakeFile("IPXNET.COM",IPXNET_ProgramStart,"/SYSTEM/"); #endif - if (addne2k) VFILE_RegisterBuiltinFileBlob(bfb_NE2000_COM, "/SYSTEM/"); - if (addovl) VFILE_RegisterBuiltinFileBlob(bfb_GLIDE2X_OVL, "/SYSTEM/"); - - /* These are IBM PC/XT/AT ONLY. They will not work in PC-98 mode. */ - if (!IS_PC98_ARCH) { - VFILE_RegisterBuiltinFileBlob(bfb_SYS_COM, "/DOS/"); /* may rely on INT 13h or IBM PC specific functions and layout */ - VFILE_RegisterBuiltinFileBlob(bfb_FORMAT_EXE, "/DOS/"); /* does not work in PC-98 mode */ - VFILE_RegisterBuiltinFileBlob(bfb_DEFRAG_EXE, "/DOS/"); /* relies on IBM PC CGA/EGA/VGA alphanumeric display memory */ - VFILE_RegisterBuiltinFileBlob(bfb_FDISK_EXE, "/BIN/"); /* relies on IBM PC INT 13h */ - VFILE_RegisterBuiltinFileBlob(bfb_HEXMEM16_EXE, "/DEBUG/"); - VFILE_RegisterBuiltinFileBlob(bfb_HEXMEM32_EXE, "/DEBUG/"); - VFILE_RegisterBuiltinFileBlob(bfb_DOSIDLE_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_DOS32A_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_DOS4GW_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_CDPLAY_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_CDPLAY_TXT, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_CDPLAY_ZIP, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_DOSMID_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_MPXPLAY_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_ZIP_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_UNZIP_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_EMSMAGIC_COM, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_DISKCOPY_EXE, "/DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_CWSDPMI_EXE, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_PRINT_COM, "/DOS/"); - - /* It appears the latest EDIT.COM requires a 386, and it does not bother - * to detect if the CPU is a 386. If you run this program for 286 and lower - * you get a crash. */ - if (CPU_ArchitectureType >= CPU_ARCHTYPE_386) - VFILE_RegisterBuiltinFileBlob(bfb_EDIT_COM, "/DOS/"); - - VFILE_RegisterBuiltinFileBlob(bfb_LICENSE_TXT, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_EXAMPLES_BTM, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_BATCOMP_EXE, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_OPTION_EXE, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_4HELP_EXE, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_4DOS_HLP, "/4DOS/"); - VFILE_RegisterBuiltinFileBlob(bfb_4DOS_COM, "/4DOS/"); - } - if (prepared) VFILE_Register("4DOS.INI",(uint8_t *)i4dos_data,(uint32_t)strlen(i4dos_data), "/4DOS/"); if (IS_VGA_ARCH) { VFILE_RegisterBuiltinFileBlob(bfb_VGA_COM, "/TEXTUTIL/"); @@ -9549,26 +9492,6 @@ else if (!IS_PC98_ARCH) VFILE_RegisterBuiltinFileBlob(bfb_25_COM_other, "/TEXTUTIL/"); - /* MEM.COM is not compatible with PC-98 and/or 8086 emulation */ - if(!IS_PC98_ARCH && CPU_ArchitectureType >= CPU_ARCHTYPE_80186) - VFILE_RegisterBuiltinFileBlob(bfb_MEM_EXE, "/DOS/"); - else if(IS_PC98_ARCH || CPU_ArchitectureType < CPU_ARCHTYPE_80186) - VFILE_RegisterBuiltinFileBlob(bfb_MEM_EXE_PC98, "/DOS/"); - - /* DSXMENU.EXE */ - if(IS_PC98_ARCH) { - VFILE_RegisterBuiltinFileBlob(bfb_DSXMENU_EXE_PC98, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_CWSDPMI_PC98_EXE, "/BIN/"); - } - else { - VFILE_RegisterBuiltinFileBlob(bfb_DSXMENU_EXE_PC, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_SHUTDOWN_COM, "/BIN/"); - } - - VFILE_RegisterBuiltinFileBlob(bfb_EVAL_EXE, "/BIN/"); - if(!IS_PC98_ARCH) - VFILE_RegisterBuiltinFileBlob(bfb_EVAL_HLP, "/BIN/"); - VFILE_RegisterBuiltinFileBlob(bfb_EGA18_CPI, "/CPI/"); VFILE_RegisterBuiltinFileBlob(bfb_EGA17_CPX, "/CPI/"); VFILE_RegisterBuiltinFileBlob(bfb_EGA16_CPX, "/CPI/"); --- a/src/builtin/Makefile.am +++ b/src/builtin/Makefile.am @@ -2,49 +2,8 @@ noinst_LIBRARIES = libbuiltin.a libbuiltin_a_SOURCES = \ - dsxmenu_exe_pc98.cpp \ - dsxmenu_exe_pc.cpp \ - cwsdpmi_exe_pc98.cpp \ - cwsdpmi_exe.cpp \ - dos32a_exe.cpp \ - dos4gw_exe.cpp \ - hexmem16_exe.cpp \ - hexmem32_exe.cpp \ - debug_exe.cpp \ - replace_exe.cpp \ - sort_exe.cpp \ - move_exe.cpp \ - mem_com.cpp \ - find_exe.cpp \ - dosidle_exe.cpp \ - lastdriv_com.cpp \ - fc_exe.cpp \ - fcbs_com.cpp \ - files_com.cpp \ - print_com.cpp \ - xcopy_exe.cpp \ - append_exe.cpp \ - edit_com.cpp \ - diskcopy_exe.cpp \ - device_com.cpp \ - buffers_com.cpp \ - defrag_exe.cpp \ - fdisk_exe.cpp \ - format_exe.cpp \ - chkdsk_exe.cpp \ - ne2000bin.cpp \ textutil.cpp \ - emsmagic.cpp \ - shutdown.cpp \ - glide2x.cpp \ - mpxplay.cpp \ - sys_com.cpp \ 28_com.cpp \ 50_com.cpp \ - 25_com.cpp \ - cdplay.cpp \ - dosmid.cpp \ - eval.cpp \ - 4dos.cpp \ - zip.cpp + 25_com.cpp