diff -dpPrTC3 /vice-0.14-2/readme.dos vice0142/readme.dos *** /vice-0.14-2/readme.dos Thu Jan 1 01:00:00 1970 --- vice0142/readme.dos Mon Apr 13 22:06:58 1998 *************** *** 0 **** --- 1,10 ---- + Instructions to compile under MS-DOS, with DJGPP version 2: + - (GNU) Binutils (as, ld, ar, ranlib), (GNU) Make, gcc, + Allegro and MIDAS must be installed. + - Change directory to "src", run "config.bat" there. + - Type "make", binaries are placed in "bin". + + If you have questions about VICE, ask the main maintainer, + Ettore Perazzoli (ettore@comm2000.it). + + Michel de Ruiter (mdruiter@cs.vu.nl) diff -dpPrTC3 /vice-0.14-2/src/arch/unix/readline/autoconf.dj2 vice0142/src/arch/unix/readline/autoconf.dj2 *** /vice-0.14-2/src/arch/unix/readline/autoconf.dj2 Thu Jan 1 01:00:00 1970 --- vice0142/src/arch/unix/readline/autoconf.dj2 Mon Apr 13 19:36:28 1998 *************** *** 0 **** --- 1,189 ---- + /* arch/unix/readline/autoconf.h. Generated automatically by configure. */ + /* autoconf.h.in. Generated automatically from configure.in by autoheader. */ + + /* Define if you have a working `mmap' system call. */ + /* #undef HAVE_MMAP */ + + /* Define as __inline if that's what the C compiler calls it. */ + /* #undef inline */ + + /* Define to `long' if doesn't define. */ + /* #undef off_t */ + + /* Define to `int' if doesn't define. */ + /* #undef pid_t */ + + /* Define as the return type of signal handlers (int or void). */ + #define RETSIGTYPE void + + /* Define to `unsigned' if doesn't define. */ + /* #undef size_t */ + + /* Define if you have the ANSI C header files. */ + #define STDC_HEADERS 1 + + /* Define if you can safely include both and . */ + #define TIME_WITH_SYS_TIME 1 + + /* Define if your declares struct tm. */ + /* #undef TM_IN_SYS_TIME */ + + /* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ + /* #undef WORDS_BIGENDIAN */ + + /* Define if the X Window System is missing or not being used. */ + /* #undef X_DISPLAY_MISSING */ + + /* Define to your X11 display depth. */ + #define X_DISPLAY_DEPTH 0 + + /* Define if you want to use Rober W. McMullen's TextField widget. */ + #define ENABLE_TEXTFIELD 1 + + /* The number of bytes in an unsigned long. */ + #define SIZEOF_UNSIGNED_LONG 4 + + /* The number of bytes in an unsigned int. */ + #define SIZEOF_UNSIGNED_INT 4 + + /* The number of bytes in an unsigned short. */ + #define SIZEOF_UNSIGNED_SHORT 2 + + /* The number of bytes in a unsigned int. */ + #define SIZEOF_UNSIGNED_INT 4 + + /* The number of bytes in a unsigned long. */ + #define SIZEOF_UNSIGNED_LONG 4 + + /* The number of bytes in a unsigned short. */ + #define SIZEOF_UNSIGNED_SHORT 2 + + /* Define if you have the getcwd function. */ + /* #undef HAVE_GETCWD */ + + /* Define if you have the getpagesize function. */ + /* #undef HAVE_GETPAGESIZE */ + + /* Define if you have the gettimeofday function. */ + #define HAVE_GETTIMEOFDAY 1 + + /* Define if you have the memmove function. */ + #define HAVE_MEMMOVE 1 + + /* Define if you have the mkdir function. */ + /* #undef HAVE_MKDIR */ + + /* Define if you have the rmdir function. */ + /* #undef HAVE_RMDIR */ + + /* Define if you have the select function. */ + /* #undef HAVE_SELECT */ + + /* Define if you have the strdup function. */ + /* #undef HAVE_STRDUP */ + + /* Define if you have the strstr function. */ + /* #undef HAVE_STRSTR */ + + /* Define if you have the strtol function. */ + /* #undef HAVE_STRTOL */ + + /* Define if you have the uname function. */ + /* #undef HAVE_UNAME */ + + /* Define if you have the usleep function. */ + #define HAVE_USLEEP 1 + + /* Define if you have the header file. */ + /* #undef HAVE_X11_SUNKEYSYM_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_X11_EXTENSIONS_XSHM_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_X11_XPM_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_BSTRING_H */ + + /* Define if you have the header file. */ + #define HAVE_DIRENT_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_DMEDIA_AUDIO_H */ + + /* Define if you have the header file. */ + #define HAVE_FCNTL_H 1 + + /* Define if you have the header file. */ + #define HAVE_LIMITS_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_LINUX_SOUNDCARD_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_MACHINE_SOUNDCARD_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_NDIR_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_REGEXP_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SGTTY_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_AUDIO_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_AUDIOIO_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_DIR_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_DIRENT_H */ + + /* Define if you have the header file. */ + #define HAVE_SYS_FILE_H 1 + + /* Define if you have the header file. */ + #define HAVE_SYS_IOCTL_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_NDIR_H */ + + /* Define if you have the header file. */ + #define HAVE_SYS_TIME_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_SYSTEMINFO_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_UNISTD_H */ + + /* Define if you have the X11 library (-lX11). */ + /* #undef HAVE_LIBX11 */ + + /* Define if you have the Xaw library (-lXaw). */ + /* #undef HAVE_LIBXAW */ + + /* Define if you have the Xaw3d library (-lXaw3d). */ + /* #undef HAVE_LIBXAW3D */ + + /* Define if you have the Xext library (-lXext). */ + /* #undef HAVE_LIBXEXT */ + + /* Define if you have the Xmu library (-lXmu). */ + /* #undef HAVE_LIBXMU */ + + /* Define if you have the Xpm library (-lXpm). */ + /* #undef HAVE_LIBXPM */ + + /* Define if you have the Xt library (-lXt). */ + /* #undef HAVE_LIBXT */ + + /* Define if you have the audio library (-laudio). */ + /* #undef HAVE_LIBAUDIO */ diff -dpPrTC3 /vice-0.14-2/src/arch/unix/readline/Makefile.dj2 vice0142/src/arch/unix/readline/Makefile.dj2 *** /vice-0.14-2/src/arch/unix/readline/Makefile.dj2 Thu Jan 1 01:00:00 1970 --- vice0142/src/arch/unix/readline/Makefile.dj2 Mon Apr 13 20:43:18 1998 *************** *** 0 **** --- 1,48 ---- + # -*- makefile -*- for DJGPP version 2. + # Generated automatically from Makefile.in by configure. + # + # This file is part of VICE, the Versatile Commodore Emulator. + # See README for copyright notice. + # + # Makefile for building the readline library using the VICE + # `configure' script. + # + # Written by Ettore Perazzoli (ettore@comm2000.it) + # + + BASEDIR = . + SRCDIR = $(BASEDIR) + + CC = gcc + CFLAGS = -g -Wall -O5 -fomit-frame-pointer -funroll-loops -finline-functions -fno-strength-reduce + DEFS = -DHAVE_CONFIG_H -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX -DHAVE_STDLIB + + RANLIB = ranlib + AR = ar + ARFLAGS = rv + + readline.a: complete.o editlin2.o sysunix.o + $(AR) $(ARFLAGS) $@ complete.o editlin2.o sysunix.o + $(RANLIB) $@ + + %.o: + $(CC) $(DEFS) $(CFLAGS) -I. -c ${SRCDIR}/$*.c -o $@ + + .c.o: + $(CC) $(DEFS) $(CFLAGS) -I. -c ${SRCDIR}/$*.c -o $@ + + clean: + rm -f *.o core readline.a + + mrproper: clean + rm -f Makefile autoconf.h + + # Dependencies. + + complete.o: $(SRCDIR)/complete.c $(SRCDIR)/editline.h + editline.o: $(SRCDIR)/editline.c $(SRCDIR)/editline.h + editlin2.o: $(SRCDIR)/editlin2.c $(SRCDIR)/editline.h + sysos9.o: $(SRCDIR)/sysos9.c $(SRCDIR)/editline.h + sysunix.o: $(SRCDIR)/sysunix.c $(SRCDIR)/editline.h + testit.o: $(SRCDIR)/testit.c + version.o: $(SRCDIR)/version.c diff -dpPrTC3 /vice-0.14-2/src/arch/unix/readline/Makefile.in vice0142/src/arch/unix/readline/Makefile.in *** /vice-0.14-2/src/arch/unix/readline/Makefile.in Tue Mar 17 21:38:50 1998 --- vice0142/src/arch/unix/readline/Makefile.in Mon Apr 13 14:03:14 1998 *************** RANLIB = @RANLIB@ *** 19,26 **** AR = @AR@ ARFLAGS = rv ! readline.a: complete.o editline2.o sysunix.o ! $(AR) $(ARFLAGS) $@ complete.o editline2.o sysunix.o $(RANLIB) $@ %.o: --- 19,26 ---- AR = @AR@ ARFLAGS = rv ! readline.a: complete.o editlin2.o sysunix.o ! $(AR) $(ARFLAGS) $@ complete.o editlin2.o sysunix.o $(RANLIB) $@ %.o: *************** mrproper: clean *** 39,45 **** complete.o: $(SRCDIR)/complete.c $(SRCDIR)/editline.h editline.o: $(SRCDIR)/editline.c $(SRCDIR)/editline.h ! editline2.o: $(SRCDIR)/editline2.c $(SRCDIR)/editline.h sysos9.o: $(SRCDIR)/sysos9.c $(SRCDIR)/editline.h sysunix.o: $(SRCDIR)/sysunix.c $(SRCDIR)/editline.h testit.o: $(SRCDIR)/testit.c --- 39,45 ---- complete.o: $(SRCDIR)/complete.c $(SRCDIR)/editline.h editline.o: $(SRCDIR)/editline.c $(SRCDIR)/editline.h ! editlin2.o: $(SRCDIR)/editlin2.c $(SRCDIR)/editline.h sysos9.o: $(SRCDIR)/sysos9.c $(SRCDIR)/editline.h sysunix.o: $(SRCDIR)/sysunix.c $(SRCDIR)/editline.h testit.o: $(SRCDIR)/testit.c diff -dpPrTC3 /vice-0.14-2/src/arch/unix/widgets/Makefile.in vice0142/src/arch/unix/widgets/Makefile.in *** /vice-0.14-2/src/arch/unix/widgets/Makefile.in Tue Mar 17 21:38:50 1998 --- vice0142/src/arch/unix/widgets/Makefile.in Mon Apr 13 14:04:18 1998 *************** DrawString.o: $(SRCDIR)/DrawString.c $(S *** 55,66 **** FileSel.o: $(SRCDIR)/FileSel.c ./autoconf.h $(SRCDIR)/ScrListP.h \ $(SRCDIR)/ScrList.h $(SRCDIR)/FileSelP.h $(SRCDIR)/DirMgr.h \ $(SRCDIR)/Directory.h $(SRCDIR)/FileSel.h $(SRCDIR)/TextField.h ! MultiList.o: $(SRCDIR)/MultiList.c $(SRCDIR)/MultiListP.h \ $(SRCDIR)/MultiList.h $(SRCDIR)/TabString.h RegExp.o: $(SRCDIR)/RegExp.c ./autoconf.h $(SRCDIR)/RegExp.h ! ScrList.o: $(SRCDIR)/ScrList.c $(SRCDIR)/MultiListP.h $(SRCDIR)/MultiList.h \ $(SRCDIR)/ScrListP.h $(SRCDIR)/ScrList.h Tablist2Tabs.o: $(SRCDIR)/Tablist2Tabs.c $(SRCDIR)/TabString.h ! TextField.o: $(SRCDIR)/TextField.c $(SRCDIR)/TextFieldP.h $(SRCDIR)/TextField.h TextWidth.o: $(SRCDIR)/TextWidth.c $(SRCDIR)/TabString.h strnchr.o: $(SRCDIR)/strnchr.c $(SRCDIR)/TabString.h --- 55,66 ---- FileSel.o: $(SRCDIR)/FileSel.c ./autoconf.h $(SRCDIR)/ScrListP.h \ $(SRCDIR)/ScrList.h $(SRCDIR)/FileSelP.h $(SRCDIR)/DirMgr.h \ $(SRCDIR)/Directory.h $(SRCDIR)/FileSel.h $(SRCDIR)/TextField.h ! MultiList.o: $(SRCDIR)/MultiList.c $(SRCDIR)/MultiLiP.h \ $(SRCDIR)/MultiList.h $(SRCDIR)/TabString.h RegExp.o: $(SRCDIR)/RegExp.c ./autoconf.h $(SRCDIR)/RegExp.h ! ScrList.o: $(SRCDIR)/ScrList.c $(SRCDIR)/MultiLiP.h $(SRCDIR)/MultiList.h \ $(SRCDIR)/ScrListP.h $(SRCDIR)/ScrList.h Tablist2Tabs.o: $(SRCDIR)/Tablist2Tabs.c $(SRCDIR)/TabString.h ! TextField.o: $(SRCDIR)/TextField.c $(SRCDIR)/TextFieP.h $(SRCDIR)/TextField.h TextWidth.o: $(SRCDIR)/TextWidth.c $(SRCDIR)/TabString.h strnchr.o: $(SRCDIR)/strnchr.c $(SRCDIR)/TabString.h diff -dpPrTC3 /vice-0.14-2/src/arch/unix/widgets/MultiList.c vice0142/src/arch/unix/widgets/MultiList.c *** /vice-0.14-2/src/arch/unix/widgets/MultiList.c Sun May 4 15:47:18 1997 --- vice0142/src/arch/unix/widgets/MultiList.c Mon Apr 13 14:04:42 1998 *************** *** 59,65 **** #include #include ! #include "MultiListP.h" #include "TabString.h" /*===========================================================================* --- 59,65 ---- #include #include ! #include "MultiLiP.h" #include "TabString.h" /*===========================================================================* diff -dpPrTC3 /vice-0.14-2/src/arch/unix/widgets/ScrList.c vice0142/src/arch/unix/widgets/ScrList.c *** /vice-0.14-2/src/arch/unix/widgets/ScrList.c Mon Aug 25 17:04:46 1997 --- vice0142/src/arch/unix/widgets/ScrList.c Mon Apr 13 14:05:16 1998 *************** *** 30,36 **** #include #include #include ! #include "MultiListP.h" #include "MultiList.h" #include "ScrListP.h" #include "ScrList.h" --- 30,36 ---- #include #include #include ! #include "MultiLiP.h" #include "MultiList.h" #include "ScrListP.h" #include "ScrList.h" diff -dpPrTC3 /vice-0.14-2/src/arch/unix/widgets/TextField.c vice0142/src/arch/unix/widgets/TextField.c *** /vice-0.14-2/src/arch/unix/widgets/TextField.c Thu Feb 19 15:29:48 1998 --- vice0142/src/arch/unix/widgets/TextField.c Mon Apr 13 14:05:32 1998 *************** *** 35,41 **** #include /*#include */ ! #include "TextFieldP.h" #define offset(field) XtOffsetOf(TextFieldRec, text.field) static XtResource resources[] = --- 35,41 ---- #include /*#include */ ! #include "TextFieP.h" #define offset(field) XtOffsetOf(TextFieldRec, text.field) static XtResource resources[] = diff -dpPrTC3 /vice-0.14-2/src/c64/vicii.c vice0142/src/c64/vicii.c *** /vice-0.14-2/src/c64/vicii.c Sun Mar 29 18:08:24 1998 --- vice0142/src/c64/vicii.c Mon Apr 13 15:27:18 1998 *************** *** 66,74 **** #endif /* !__MSDOS__ */ #include "vice.h" #include "vicii.h" #include "vmachine.h" - #include "interrupt.h" #include "maincpu.h" #include "mem.h" --- 66,74 ---- #endif /* !__MSDOS__ */ #include "vice.h" + #include "interrupt.h" #include "vicii.h" #include "vmachine.h" #include "maincpu.h" #include "mem.h" diff -dpPrTC3 /vice-0.14-2/src/changelog.1 vice0142/src/changelog.1 *** /vice-0.14-2/src/changelog.1 Sat Mar 21 14:54:40 1998 --- vice0142/src/changelog.1 Mon Apr 13 14:15:02 1998 *************** Sat Mar 7 15:11:45 1998 Ettore Perazzo *** 225,231 **** (draw_line): Renamed to `draw_standard_line'. (draw_line_2x): Renamed to `draw_standard_line_2x'. (draw_line_cached): Renamed to `draw_standard_line_cached'. ! (draw_line_cached_2x): Renamed to `draw_standard_line_cached_2x". (draw_reverse_line, draw_reverse_line_2x): New functions. (draw_reverse_line_cached, draw_reverse_line_cached_2x): New functions. --- 225,231 ---- (draw_line): Renamed to `draw_standard_line'. (draw_line_2x): Renamed to `draw_standard_line_2x'. (draw_line_cached): Renamed to `draw_standard_line_cached'. ! (draw_line_cached_2x): Renamed to `draw_standard_line_cached_2x'. (draw_reverse_line, draw_reverse_line_2x): New functions. (draw_reverse_line_cached, draw_reverse_line_cached_2x): New functions. diff -dpPrTC3 /vice-0.14-2/src/config.bat vice0142/src/config.bat *** /vice-0.14-2/src/config.bat Thu Jan 1 01:00:00 1970 --- vice0142/src/config.bat Mon Apr 13 22:18:34 1998 *************** *** 0 **** --- 1,6 ---- + @echo off + copy Makefile.dj2 Makefile > nul + copy include\autoconf.dj2 include\autoconf.h > nul + copy arch\unix\readline\Makefile.dj2 arch\unix\readline\Makefile > nul + copy arch\unix\readline\autoconf.dj2 arch\unix\readline\autoconf.h > nul + echo Type "make" to make the binaries. diff -dpPrTC3 /vice-0.14-2/src/config.guess vice0142/src/config.guess *** /vice-0.14-2/src/config.guess Wed Dec 4 19:05:04 1996 --- vice0142/src/config.guess Mon Apr 13 14:17:32 1998 *************** EOF *** 552,557 **** --- 552,560 ---- # says echo i586-unisys-sysv4 exit 0 ;; + pc:*:*:*) # e.g. pc:MS-DOS:7:00, nothing about processor + echo i386-pc-msdosdjgpp + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 *************** main () *** 567,573 **** #if defined (sony) #if defined (MIPSEB) /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ! I don't know.... */ printf ("mips-sony-bsd\n"); exit (0); #else #include --- 570,576 ---- #if defined (sony) #if defined (MIPSEB) /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ! I don\'t know.... */ printf ("mips-sony-bsd\n"); exit (0); #else #include diff -dpPrTC3 /vice-0.14-2/src/configure.in vice0142/src/configure.in *** /vice-0.14-2/src/configure.in Wed Mar 11 21:59:28 1998 --- vice0142/src/configure.in Mon Apr 13 17:46:20 1998 *************** fi *** 46,59 **** dnl Setup go32 crosscompiling. ! if test "$host_vendor" = "go32" -o "$host_vendor" = "msdos"; then dnl Some GCC cross-compilers are installed with a different name dnl instead of using the GCC architecture targeting features. dnl Check for the most common ones. AC_CHECK_PROG(CC, gcc-dos, gcc-dos, gcc) ! if test "$CC" = "gcc" ; then CFLAGS="-b i386-go32" LDFLAGS="-b i386-go32" fi --- 46,59 ---- dnl Setup go32 crosscompiling. ! if test "$host_vendor" = "go32" -o "$host_vendor" = "msdos" -o "$host_os" = "msdosdjgpp"; then dnl Some GCC cross-compilers are installed with a different name dnl instead of using the GCC architecture targeting features. dnl Check for the most common ones. AC_CHECK_PROG(CC, gcc-dos, gcc-dos, gcc) ! if test "$CC" = "gcc" -a "$host_os" != "msdosdjgpp" ; then CFLAGS="-b i386-go32" LDFLAGS="-b i386-go32" fi *************** fi *** 167,177 **** dnl Define the type sizes. ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then AC_C_BIGENDIAN ! AC_CHECK_SIZEOF(unsigned short) ! AC_CHECK_SIZEOF(unsigned int) ! AC_CHECK_SIZEOF(unsigned long) else dnl if cross-compiling, we have to do this by hand AC_DEFINE(SIZEOF_UNSIGNED_SHORT, 2) --- 167,177 ---- dnl Define the type sizes. ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos" -a "$host_os" != "msdosdjgpp"; then AC_C_BIGENDIAN ! AC_CHECK_SIZEOF(unsigned short, 2) ! AC_CHECK_SIZEOF(unsigned int, 4) ! AC_CHECK_SIZEOF(unsigned long, 4) else dnl if cross-compiling, we have to do this by hand AC_DEFINE(SIZEOF_UNSIGNED_SHORT, 2) *************** AC_DECL_SYS_SIGLIST *** 193,199 **** dnl Check for system-specific header files. ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then AC_CHECK_HEADER(linux/joystick.h, [ LINUXJOYSTICK=-DHAS_JOYSTICK ; JOY_OBJS='$(ARCHDIR)/joystick.o' ], ) --- 193,199 ---- dnl Check for system-specific header files. ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos" -a "$host_os" != "msdosdjgpp"; then AC_CHECK_HEADER(linux/joystick.h, [ LINUXJOYSTICK=-DHAS_JOYSTICK ; JOY_OBJS='$(ARCHDIR)/joystick.o' ], ) *************** fi *** 217,223 **** dnl Check for library functions ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then AC_FUNC_MEMCMP fi AC_TYPE_SIGNAL --- 217,223 ---- dnl Check for library functions ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos" -a "$host_os" != "msdosdjgpp"; then AC_FUNC_MEMCMP fi AC_TYPE_SIGNAL *************** AC_STRUCT_TM *** 237,243 **** dnl Check for X11 libraries and header files ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then AC_PATH_XTRA --- 237,243 ---- dnl Check for X11 libraries and header files ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos" -a "$host_os" != "msdosdjgpp"; then AC_PATH_XTRA *************** fi *** 297,322 **** dnl Setup the system-specific object files. ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then ARCHDIR="\$(UNIXDIR)" ! ARCHODIR="\$(UNIXODIR)" ! SYSPEC_OBJS="$SYSPEC_OBJS \$(ARCHODIR)/video.o" COMMON_LIBS="\$(READLINE) \$(WIDGETS)" ! X64_SYSPEC_OBJS="\$(ARCHODIR)/ui_xaw.o \$(ARCHODIR)/xdebug.o \$(ARCHODIR)/vsync.o \$(ARCHODIR)/kbd.o" ! XVIC_SYSPEC_OBJS="\$(ARCHODIR)/ui_xaw_VIC20.o \$(ARCHODIR)/xdebug_VIC20.o \$(ARCHODIR)/kbd_VIC20.o \$(ARCHODIR)/vsync_VIC20.o" ! XPET_SYSPEC_OBJS="\$(ARCHODIR)/ui_xaw_PET.o \$(ARCHODIR)/xdebug_PET.o \$(ARCHODIR)/kbd_PET.o \$(ARCHODIR)/vsync_PET.o" else ARCHDIR="\$(MSDOSDIR)" ! ARCHODIR="\$(MSDOSODIR)" ! SYSPEC_OBJS="$SYSPEC_OBJS \$(ARCHODIR)/vmidas.o \$(ARCHODIR)/tuimenu.o \$(ARCHODIR)/tui.o \$(ARCHODIR)/tuifs.o \$(ARCHODIR)/tuiview.o \$(ARCHODIR)/video.o \$(ARCHODIR)/joystick.o" COMMON_LIBS="" ! X64_SYSPEC_OBJS="\$(ARCHODIR)/ui.o \$(ARCHODIR)/vsync.o \$(ARCHODIR)/kbd.o" ! XVIC_SYSPEC_OBJS="\$(ARCHODIR)/ui_VIC20.o \$(ARCHODIR)/vsync_VIC20.o \$(ARCHODIR)/kbd_VIC20.o" ! XPET_SYSPEC_OBJS="\$(ARCHODIR)/ui_PET.o \$(ARCHODIR)/vsync_PET.o \$(ARCHODIR)/kbd_PET.o" fi AC_SUBST(ARCHDIR) - AC_SUBST(ARCHODIR) AC_SUBST(X64_SYSPEC_OBJS) AC_SUBST(XVIC_SYSPEC_OBJS) AC_SUBST(XPET_SYSPEC_OBJS) --- 297,319 ---- dnl Setup the system-specific object files. ! if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos" -a "$host_os" != "msdosdjgpp"; then ARCHDIR="\$(UNIXDIR)" ! SYSPEC_OBJS="$SYSPEC_OBJS video.o" COMMON_LIBS="\$(READLINE) \$(WIDGETS)" ! X64_SYSPEC_OBJS="\$(C64ODIR)/ui_xaw.o \$(C64ODIR)/xdebug.o \$(C64ODIR)/kbd.o \$(C64ODIR)/vsync.o" ! XVIC_SYSPEC_OBJS="\$(VICODIR)/ui_xaw.o \$(VICODIR)/xdebug.o \$(VICODIR)/kbd.o \$(VICODIR)/vsync.o" ! XPET_SYSPEC_OBJS="\$(PETODIR)/ui_xaw.o \$(PETODIR)/xdebug.o \$(PETODIR)/kbd.o \$(PETODIR)/vsync.o" else ARCHDIR="\$(MSDOSDIR)" ! SYSPEC_OBJS="$SYSPEC_OBJS vmidas.o tuimenu.o tui.o tuifs.o tuiview.o video.o joystick.o" COMMON_LIBS="" ! X64_SYSPEC_OBJS="\$(C64ODIR)/ui.o \$(C64ODIR)/vsync.o \$(C64ODIR)/kbd.o" ! XVIC_SYSPEC_OBJS="\$(VICODIR)/ui.o \$(VICODIR)/vsync.o \$(VICODIR)/kbd.o" ! XPET_SYSPEC_OBJS="\$(PETODIR)/ui.o \$(PETODIR)/vsync.o \$(PETODIR)/kbd.o" fi AC_SUBST(ARCHDIR) AC_SUBST(X64_SYSPEC_OBJS) AC_SUBST(XVIC_SYSPEC_OBJS) AC_SUBST(XPET_SYSPEC_OBJS) diff -dpPrTC3 /vice-0.14-2/src/include/autoconf.dj2 vice0142/src/include/autoconf.dj2 *** /vice-0.14-2/src/include/autoconf.dj2 Thu Jan 1 01:00:00 1970 --- vice0142/src/include/autoconf.dj2 Mon Apr 13 19:36:08 1998 *************** *** 0 **** --- 1,195 ---- + /* include/autoconf.h. Generated automatically by configure. */ + /* include/autoconf.h.in. Generated automatically from configure.in by autoheader. */ + + /* Define if you have . */ + /* #undef HAVE_VFORK_H */ + + /* Define as __inline if that's what the C compiler calls it. */ + /* #undef inline */ + + /* Define to `long' if doesn't define. */ + /* #undef off_t */ + + /* Define to `int' if doesn't define. */ + /* #undef pid_t */ + + /* Define as the return type of signal handlers (int or void). */ + #define RETSIGTYPE void + + /* Define to `unsigned' if doesn't define. */ + /* #undef size_t */ + + /* Define if you have the ANSI C header files. */ + #define STDC_HEADERS 1 + + /* Define if `sys_siglist' is declared by . */ + /* #undef SYS_SIGLIST_DECLARED */ + + /* Define if you can safely include both and . */ + #define TIME_WITH_SYS_TIME 1 + + /* Define if your declares struct tm. */ + /* #undef TM_IN_SYS_TIME */ + + /* Define vfork as fork if vfork does not work. */ + #define vfork fork + + /* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ + /* #undef WORDS_BIGENDIAN */ + + /* Define if the X Window System is missing or not being used. */ + /* #undef X_DISPLAY_MISSING */ + + /* Define to your X11 display depth. */ + #define X_DISPLAY_DEPTH 0 + + /* Define if you want to use Rober W. McMullen's TextField widget. */ + #define ENABLE_TEXTFIELD 1 + + /* The number of bytes in an unsigned long. */ + #define SIZEOF_UNSIGNED_LONG 4 + + /* The number of bytes in an unsigned int. */ + #define SIZEOF_UNSIGNED_INT 4 + + /* The number of bytes in an unsigned short. */ + #define SIZEOF_UNSIGNED_SHORT 2 + + /* Does libXext have XShmPutImage? */ + /* #undef HAVE_XSHMPUTIMAGE */ + + /* The number of bytes in a unsigned int. */ + #define SIZEOF_UNSIGNED_INT 4 + + /* The number of bytes in a unsigned long. */ + #define SIZEOF_UNSIGNED_LONG 4 + + /* The number of bytes in a unsigned short. */ + #define SIZEOF_UNSIGNED_SHORT 2 + + /* Define if you have the atexit function. */ + #define HAVE_ATEXIT 1 + + /* Define if you have the gettimeofday function. */ + #define HAVE_GETTIMEOFDAY 1 + + /* Define if you have the memmove function. */ + #define HAVE_MEMMOVE 1 + + /* Define if you have the usleep function. */ + #define HAVE_USLEEP 1 + + /* Define if you have the header file. */ + /* #undef HAVE_SDL_AUDIO_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SDL_SLEEP_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_UMS_UMSAUDIODEVICE_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_UMS_UMSBAUDDEVICE_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_X11_SUNKEYSYM_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_X11_EXTENSIONS_XSHM_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_X11_XPM_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_BSTRING_H */ + + /* Define if you have the header file. */ + #define HAVE_DIRENT_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_DMEDIA_AUDIO_H */ + + /* Define if you have the header file. */ + #define HAVE_FCNTL_H 1 + + /* Define if you have the header file. */ + #define HAVE_LIMITS_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_LINUX_SOUNDCARD_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_MACHINE_SOUNDCARD_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_NDIR_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_REGEXP_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SGTTY_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_AUDIO_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_AUDIOIO_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_DIR_H */ + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_DIRENT_H */ + + /* Define if you have the header file. */ + #define HAVE_SYS_FILE_H 1 + + /* Define if you have the header file. */ + #define HAVE_SYS_IOCTL_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_SYS_NDIR_H */ + + /* Define if you have the header file. */ + #define HAVE_SYS_PARAM_H 1 + + /* Define if you have the header file. */ + #define HAVE_SYS_TIME_H 1 + + /* Define if you have the header file. */ + /* #undef HAVE_SYSTEMINFO_H */ + + /* Define if you have the SDL library (-lSDL). */ + /* #undef HAVE_LIBSDL */ + + /* Define if you have the UMSobj library (-lUMSobj). */ + /* #undef HAVE_LIBUMSOBJ */ + + /* Define if you have the X11 library (-lX11). */ + /* #undef HAVE_LIBX11 */ + + /* Define if you have the Xaw library (-lXaw). */ + /* #undef HAVE_LIBXAW */ + + /* Define if you have the Xaw3d library (-lXaw3d). */ + /* #undef HAVE_LIBXAW3D */ + + /* Define if you have the Xext library (-lXext). */ + /* #undef HAVE_LIBXEXT */ + + /* Define if you have the Xmu library (-lXmu). */ + /* #undef HAVE_LIBXMU */ + + /* Define if you have the Xpm library (-lXpm). */ + /* #undef HAVE_LIBXPM */ + + /* Define if you have the Xt library (-lXt). */ + /* #undef HAVE_LIBXT */ + + /* Define if you have the audio library (-laudio). */ + /* #undef HAVE_LIBAUDIO */ + + /* Define if you have the socket library (-lsocket). */ + /* #undef HAVE_LIBSOCKET */ diff -dpPrTC3 /vice-0.14-2/src/Makefile.dj2 vice0142/src/Makefile.dj2 *** /vice-0.14-2/src/Makefile.dj2 Thu Jan 1 01:00:00 1970 --- vice0142/src/Makefile.dj2 Mon Apr 13 21:37:26 1998 *************** *** 0 **** --- 1,538 ---- + # -*- makefile -*- for DJGPP version 2. + # + # This file is part of VICE, the Versatile Commodore Emulator. + # See README for Copyright notice. + # + + BASEDIR = . + TOPDIR = $(BASEDIR)/.. + + SRCDIR = $(BASEDIR) + UNIXDIR = $(SRCDIR)/arch/unix + READLINEDIR = $(UNIXDIR)/readline + READLINEODIR = ./arch/unix/readline + MSDOSDIR = $(SRCDIR)/arch/msdos + ARCHDIR = $(MSDOSDIR) + + C64DIR = $(SRCDIR)/c64 + C64ODIR = ./c64 + VICDIR = $(SRCDIR)/vic20 + VICODIR = ./vic20 + PETDIR = $(SRCDIR)/pet + PETODIR = ./pet + + READLINE = $(READLINEODIR)/readline.a + + BINDIR = ../bin + INCLUDEDIR = $(SRCDIR)/include + + CC = gcc + + LDFLAGS = -s + DEFS = -DHAVE_CONFIG_H -DPREFIX=\"${DJDIR}\" + CFLAGS = -g -Wall -O5 -fomit-frame-pointer -funroll-loops -finline-functions -fno-strength-reduce + INCLUDES = -I$(SRCDIR) -I./include -I$(ARCHDIR) -I$(INCLUDEDIR) + LIBS = -lalleg -lmidas + + ### Distribution files + + ## VICE sources + + C64SRC = $(C64DIR)/cia1.c $(C64DIR)/cia2.c $(C64DIR)/c64mem.c \ + $(C64DIR)/vicii.c $(C64DIR)/cia1.def $(C64DIR)/cia2.def \ + $(C64DIR)/autostart.c $(C64DIR)/c64mem.h + + VICSRC = $(VICDIR)/via1.c $(VICDIR)/via2.c $(VICDIR)/vic20mem.c \ + $(VICDIR)/vic.c $(VICDIR)/via1.def $(VICDIR)/via2.def \ + $(VICDIR)/vic20mem.h + + PETSRC = $(PETDIR)/viap.c $(PETDIR)/petmem.c $(PETDIR)/crtc.c \ + $(PETDIR)/viap.def $(PETDIR)/pets.c $(PETDIR)/pia.c \ + $(PETDIR)/petmem.h $(PETDIR)/pets.h + + VICESRC = $(SRCDIR)/1541cpu.c $(SRCDIR)/6510core.c $(SRCDIR)/asm.c \ + $(SRCDIR)/c1541.c $(SRCDIR)/charsets.c $(SRCDIR)/cia-tmpl.c \ + $(SRCDIR)/drive.c $(SRCDIR)/info.c $(SRCDIR)/main.c \ + $(SRCDIR)/maincpu.c $(SRCDIR)/memcmp.c $(SRCDIR)/memutils.c \ + $(SRCDIR)/misc.c $(SRCDIR)/mon.c $(SRCDIR)/mshell.c \ + $(SRCDIR)/parallel.c $(SRCDIR)/patchrom.c $(SRCDIR)/petcat.c \ + $(SRCDIR)/raster.c $(SRCDIR)/resources.c $(SRCDIR)/reu.c \ + $(SRCDIR)/serial.c $(SRCDIR)/sid.c $(SRCDIR)/tape.c \ + $(SRCDIR)/tapeunit.c $(SRCDIR)/tpi.c $(SRCDIR)/traps.c \ + $(SRCDIR)/true1541.c $(SRCDIR)/usleep.c $(SRCDIR)/utils.c \ + $(SRCDIR)/via-tmpl.c $(SRCDIR)/viad1.c $(SRCDIR)/viad2.c \ + $(SRCDIR)/viad1.def $(SRCDIR)/viad2.def $(SRCDIR)/warn.c \ + $(SRCDIR)/zfile.c + + # MS-DOS-specific sources. + + MSDOSSRC = $(MSDOSDIR)/joystick.c $(MSDOSDIR)/kbd.c $(MSDOSDIR)/vmidas.c \ + $(MSDOSDIR)/tuimenu.c $(MSDOSDIR)/tui.c $(MSDOSDIR)/tuifs.c \ + $(MSDOSDIR)/ui.c $(MSDOSDIR)/video.c $(MSDOSDIR)/vsync.c \ + $(MSDOSDIR)/tuiview.c + + ### Libraries. + + ## Readline sources + + READLINESRC = $(READLINEDIR)/complete.c $(READLINEDIR)/editline.c \ + $(READLINEDIR)/editlin2.c $(READLINEDIR)/sysos9.c \ + $(READLINEDIR)/sysunix.c $(READLINEDIR)/testit.c \ + $(READLINEDIR)/version.c + + ### Object files + + SYSPEC_OBJS = vmidas.o tuimenu.o tui.o tuifs.o tuiview.o video.o joystick.o + X64_SYSPEC_OBJS = $(C64ODIR)/ui.o $(C64ODIR)/vsync.o $(C64ODIR)/kbd.o + XVIC_SYSPEC_OBJS = $(VICODIR)/ui.o $(VICODIR)/vsync.o $(VICODIR)/kbd.o + XPET_SYSPEC_OBJS = $(PETODIR)/ui.o $(PETODIR)/vsync.o $(PETODIR)/kbd.o + + COMMON_OBJS = charsets.o info.o mshell.o tape.o warn.o utils.o zfile.o \ + memutils.o drive.o asm.o + + TRUE1541_OBJS = viad1.o viad2.o 1541cpu.o + + PARALLEL_OBJS = parallel.o + + C64_OBJS = $(C64ODIR)/main.o $(C64ODIR)/maincpu.o $(C64ODIR)/misc.o \ + $(C64ODIR)/mon.o $(C64ODIR)/patchrom.o $(C64ODIR)/reu.o \ + $(C64ODIR)/resources.o $(C64ODIR)/serial.o \ + $(C64ODIR)/tapeunit.o $(C64ODIR)/tpi.o $(C64ODIR)/traps.o \ + $(C64ODIR)/true1541.o $(C64ODIR)/sid.o + + C64_LOBJS = $(C64ODIR)/cia1.o $(C64ODIR)/cia2.o $(C64ODIR)/c64mem.o \ + $(C64ODIR)/vicii.o $(C64ODIR)/autostart.o + + VIC20_OBJS = $(VICODIR)/maincpu.o $(VICODIR)/main.o \ + $(VICODIR)/misc.o $(VICODIR)/mon.o $(VICODIR)/resources.o \ + $(VICODIR)/serial.o $(VICODIR)/tapeunit.o $(VICODIR)/true1541.o \ + $(VICODIR)/sid.o $(VICODIR)/traps.o + + VIC20_LOBJS = $(VICODIR)/via1.o $(VICODIR)/via2.o $(VICODIR)/vic20mem.o \ + $(VICODIR)/vic.o + + PET_OBJS = $(PETODIR)/maincpu.o $(PETODIR)/main.o \ + $(PETODIR)/misc.o $(PETODIR)/mon.o $(PETODIR)/resources.o \ + $(PETODIR)/serial.o $(PETODIR)/sid.o $(PETODIR)/traps.o + + PET_LOBJS = $(PETODIR)/viap.o $(PETODIR)/petmem.o $(PETODIR)/crtc.o \ + $(PETODIR)/pets.o $(PETODIR)/pia.o + + C64_DEPS = $(C64_OBJS) $(X64_SYSPEC_OBJS) $(PARALLEL_OBJS) \ + $(TRUE1541_OBJS) $(COMMON_OBJS) $(SYSPEC_OBJS) $(C64_LOBJS) + + VIC_DEPS = $(VIC20_OBJS) $(XVIC_SYSPEC_OBJS) \ + $(TRUE1541_OBJS) $(COMMON_OBJS) $(SYSPEC_OBJS) $(VIC20_LOBJS) + + PET_DEPS = $(PET_OBJS) $(XPET_SYSPEC_OBJS) $(PARALLEL_OBJS) \ + $(COMMON_OBJS) $(SYSPEC_OBJS) $(PET_LOBJS) + + C1541_OBJS = c1541.o + + C1541_DEPS = $(C1541_OBJS) stddrive.o tape.o mshell.o charsets.o utils.o \ + zfile.o $(READLINE) + + PETCAT_OBJS = petcat.o + + PETCAT_DEPS = $(PETCAT_OBJS) charsets.o tape.o utils.o zfile.o + + VICEOBJS = $(COMMON_OBJS) $(SYSPEC_OBJS) $(C64_OBJS) \ + $(X64_SYSPEC_OBJS) $(VIC20_OBJS) $(XVIC_SYSPEC_OBJS) \ + $(PET_OBJS) $(XPET_SYSPEC_OBJS) $(C1541_OBJS) $(PETCAT_OBJS) \ + $(TRUE1541_OBJS) $(PARALLEL_OBJS) $(C64_LOBJS) \ + $(VIC20_LOBJS) $(PET_LOBJS) + + EMUBIN = $(BINDIR)/x64.exe $(BINDIR)/xvic.exe $(BINDIR)/xpet.exe + + UTILBIN = $(BINDIR)/c1541.exe $(BINDIR)/petcat.exe + + TARGET = $(EMUBIN) $(UTILBIN) + + ### Default target (build everything) + + .PHONY: all + all: $(TARGET) + + ### Default rule for building C object files. + + %.o: %.c + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $< + + .c.o: + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $< + + $(COMMON_OBJS) $(TRUE1541_OBJS) $(PARALLEL_OBJS) $(C1541_OBJS) $(PETCAT_OBJS): + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) + + $(SYSPEC_OBJS): + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@:.o=.c) + + ### `readline' library + + $(READLINE): + $(MAKE) -C $(READLINEODIR) + + ### x64 + + .PHONY: x64 + x64: $(BINDIR)/x64.exe + + $(BINDIR)/x64.exe: $(C64_DEPS) + $(CC) $(LDFLAGS) -o $@ $(C64_DEPS) $(LIBS) -lm + + $(C64_OBJS): + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@F:.o=.c) + + $(X64_SYSPEC_OBJS): + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@F:.o=.c) + + $(C64_LOBJS): + $(CC) -DCBM64 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) + + ### xvic + + .PHONY: xvic + xvic: $(BINDIR)/xvic.exe + + $(BINDIR)/xvic.exe: $(VIC_DEPS) + $(CC) $(LDFLAGS) -o $@ $(VIC_DEPS) $(LIBS) -lm + + $(VIC20_OBJS): + $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@F:.o=.c) + + $(XVIC_SYSPEC_OBJS): + $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@F:.o=.c) + + $(VIC20_LOBJS): + $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) + + ### xpet + + .PHONY: xpet + xpet: $(BINDIR)/xpet.exe + + $(BINDIR)/xpet.exe: $(PET_DEPS) + $(CC) $(LDFLAGS) -o $@ $(PET_DEPS) $(LIBS) -lm + + $(PET_OBJS): + $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@F:.o=.c) + + $(XPET_SYSPEC_OBJS): + $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@F:.o=.c) + + $(PET_LOBJS): + $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) + + ### Utilities: c1541 and petcat + + .PHONY: utils + utils: c1541 petcat + + .PHONY: c1541 + c1541: $(BINDIR)/c1541.exe + + $(BINDIR)/c1541.exe: $(C1541_DEPS) + $(CC) $(LDFLAGS) -o $@ $(C1541_DEPS) + + .PHONY: petcat + petcat: $(BINDIR)/petcat.exe + + $(BINDIR)/petcat.exe: $(PETCAT_DEPS) + $(CC) $(LDFLAGS) -o $@ $(PETCAT_DEPS) + + stddrive.o: $(SRCDIR)/drive.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) -DSTANDALONE_1541 -o stddrive.o $(SRCDIR)/drive.c + + stdprinter.o: $(SRCDIR)/printer.c + $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) -DSTANDALONE_PRINTER -o stdprinter.o $(SRCDIR)/printer.c + + ### Automatically generated dependencies. + ### This part of Makefile is updated automatically by the `mkdep' + ### script. + + # DO NOT DELETE + charsets.o: ./charsets.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/ctype.h \ + $(DJDIR)/include/inlines/ctype.ha $(DJDIR)/include/inlines/ctype.hd \ + include/charsets.h include/types.h + info.o: ./info.c + mshell.o: ./mshell.c $(DJDIR)/include/stdio.h \ + $(DJDIR)/include/sys/djtypes.h $(DJDIR)/include/stdlib.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + $(DJDIR)/include/ctype.h $(DJDIR)/include/inlines/ctype.ha \ + $(DJDIR)/include/inlines/ctype.hd $(DJDIR)/include/sys/types.h \ + include/vice.h include/autoconf.h $(DJDIR)/include/limits.h \ + $(DJDIR)/include/sys/param.h include/types.h include/mshell.h + tape.o: ./tape.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/sys/types.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/stdlib.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + $(DJDIR)/include/ctype.h $(DJDIR)/include/inlines/ctype.ha \ + $(DJDIR)/include/inlines/ctype.hd $(DJDIR)/include/unistd.h \ + include/drive.h $(DJDIR)/include/time.h include/types.h \ + include/fs_cbm.h include/serial.h include/tape.h include/zfile.h \ + $(DJDIR)/include/sys/stat.h $(DJDIR)/include/fcntl.h include/utils.h \ + include/charsets.h + warn.o: ./warn.c $(DJDIR)/include/stdio.h \ + $(DJDIR)/include/sys/djtypes.h $(DJDIR)/include/stdlib.h \ + $(DJDIR)/include/stdarg.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h include/warn.h + utils.o: ./utils.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/sys/stat.h $(DJDIR)/include/sys/types.h \ + $(DJDIR)/include/sys/djtypes.h $(DJDIR)/include/sys/wait.h \ + $(DJDIR)/include/unistd.h $(DJDIR)/include/stdio.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + $(DJDIR)/include/fcntl.h $(DJDIR)/include/stdarg.h \ + $(DJDIR)/include/process.h $(DJDIR)/include/dir.h \ + $(DJDIR)/include/io.h include/utils.h $(DJDIR)/include/stdlib.h + zfile.o: ./zfile.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/unistd.h $(DJDIR)/include/sys/types.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + $(DJDIR)/include/stdarg.h $(DJDIR)/include/ctype.h \ + $(DJDIR)/include/inlines/ctype.ha $(DJDIR)/include/inlines/ctype.hd \ + $(DJDIR)/include/errno.h include/utils.h include/zfile.h \ + $(DJDIR)/include/sys/stat.h $(DJDIR)/include/fcntl.h \ + $(DJDIR)/include/stdio.h + memutils.o: ./memutils.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h $(DJDIR)/include/sys/stat.h \ + $(DJDIR)/include/sys/types.h include/memutils.h include/types.h \ + include/resources.h include/file.h include/utils.h + drive.o: ./drive.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/ctype.h \ + $(DJDIR)/include/inlines/ctype.ha $(DJDIR)/include/inlines/ctype.hd \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + $(DJDIR)/include/sys/types.h $(DJDIR)/include/sys/stat.h \ + $(DJDIR)/include/dirent.h $(DJDIR)/include/fcntl.h \ + $(DJDIR)/include/unistd.h $(DJDIR)/include/memory.h \ + $(DJDIR)/include/assert.h $(DJDIR)/include/errno.h include/macro.h \ + include/types.h include/serial.h include/drive.h \ + $(DJDIR)/include/time.h include/fs_cbm.h include/file.h \ + include/zfile.h include/utils.h include/charsets.h include/tape.h + asm.o: ./asm.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h $(DJDIR)/include/ctype.h \ + $(DJDIR)/include/inlines/ctype.ha $(DJDIR)/include/inlines/ctype.hd \ + include/asm.h include/types.h include/misc.h include/mshell.h + c1541.o: ./c1541.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/ctype.h \ + $(DJDIR)/include/inlines/ctype.ha $(DJDIR)/include/inlines/ctype.hd \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + $(DJDIR)/include/sys/types.h $(DJDIR)/include/sys/stat.h \ + $(DJDIR)/include/fcntl.h $(DJDIR)/include/unistd.h \ + $(DJDIR)/include/memory.h $(DJDIR)/include/assert.h include/c1541.h \ + include/drive.h $(DJDIR)/include/time.h include/types.h \ + include/fs_cbm.h include/serial.h include/mshell.h include/file.h \ + include/charsets.h include/tape.h + petcat.o: ./petcat.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/ctype.h \ + $(DJDIR)/include/inlines/ctype.ha $(DJDIR)/include/inlines/ctype.hd \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + include/patchlevel.h include/charsets.h include/types.h + viad1.o: ./viad1.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/vmachine.h include/via.h include/types.h include/resources.h \ + include/true1541.h include/drive.h include/fs_cbm.h include/serial.h \ + include/1541cpu.h include/viad.h include/interrupt.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h + viad2.o: ./viad2.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/vmachine.h include/via.h include/types.h include/resources.h \ + include/true1541.h include/drive.h include/fs_cbm.h include/serial.h \ + include/1541cpu.h include/viad.h include/interrupt.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h + 1541cpu.o: ./1541cpu.c $(DJDIR)/include/stdio.h \ + $(DJDIR)/include/sys/djtypes.h $(DJDIR)/include/sys/time.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/patchlevel.h include/autoconf.h include/types.h \ + $(DJDIR)/include/limits.h include/true1541.h include/drive.h \ + include/fs_cbm.h include/serial.h include/1541cpu.h include/via.h \ + include/interrupt.h include/vmachine.h include/vice.h \ + $(DJDIR)/include/sys/param.h include/6510core.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + arch/msdos/ui.h include/resources.h include/viad.h include/misc.h \ + 6510core.c + parallel.o: ./parallel.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + include/types.h include/parallel.h include/serial.h + ./c64/cia1.o: ./c64/cia1.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + include/vmachine.h include/cia.h include/types.h include/vicii.h \ + include/maincpu.h include/mem.h c64/c64mem.h include/6510core.h \ + arch/msdos/video.h $(DJDIR)/include/pc.h \ + $(DJDIR)/include/inlines/pc.h $(DJDIR)/include/allegro.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/stddef.h \ + $(DJDIR)/include/errno.h $(DJDIR)/include/dpmi.h include/resources.h \ + arch/msdos/kbd.h include/interrupt.h + ./c64/cia2.o: ./c64/cia2.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + include/vmachine.h include/cia.h include/types.h include/vicii.h \ + include/maincpu.h include/mem.h c64/c64mem.h include/6510core.h \ + arch/msdos/video.h $(DJDIR)/include/pc.h \ + $(DJDIR)/include/inlines/pc.h $(DJDIR)/include/allegro.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/stddef.h \ + $(DJDIR)/include/errno.h $(DJDIR)/include/dpmi.h include/resources.h \ + include/true1541.h include/drive.h include/fs_cbm.h include/serial.h \ + include/1541cpu.h include/interrupt.h + ./c64/c64mem.o: ./c64/c64mem.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + include/vmachine.h include/interrupt.h include/types.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h include/true1541.h include/drive.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h include/fs_cbm.h \ + include/serial.h include/1541cpu.h c64/c64mem.h include/resources.h \ + include/vicii.h include/maincpu.h include/mem.h arch/msdos/video.h \ + $(DJDIR)/include/pc.h $(DJDIR)/include/inlines/pc.h \ + $(DJDIR)/include/allegro.h $(DJDIR)/include/stdlib.h \ + $(DJDIR)/include/stddef.h $(DJDIR)/include/errno.h \ + $(DJDIR)/include/dpmi.h include/cia.h include/sid.h \ + include/memutils.h include/parallel.h include/tpi.h include/reu.h \ + include/tapeunit.h include/tape.h + ./c64/vicii.o: ./c64/vicii.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + include/interrupt.h include/types.h include/vmachine.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h include/vicii.h include/maincpu.h \ + include/mem.h c64/c64mem.h arch/msdos/video.h $(DJDIR)/include/pc.h \ + $(DJDIR)/include/inlines/pc.h $(DJDIR)/include/allegro.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/stddef.h \ + $(DJDIR)/include/errno.h $(DJDIR)/include/dpmi.h include/raster.h \ + include/sprites.h include/sprcycles.h include/sprcrunch.h raster.c \ + $(DJDIR)/include/sys/time.h $(DJDIR)/include/time.h \ + $(DJDIR)/include/sys/types.h $(DJDIR)/include/signal.h \ + $(DJDIR)/include/unistd.h $(DJDIR)/include/stdarg.h \ + include/resources.h arch/msdos/vsync.h + ./c64/autostart.o: ./c64/autostart.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdlib.h include/vmachine.h c64/c64mem.h \ + include/types.h include/serial.h include/warn.h include/resources.h \ + include/drive.h $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/fs_cbm.h include/tape.h include/interrupt.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h include/true1541.h include/1541cpu.h \ + arch/msdos/ui.h include/autostart.h + ./vic20/via1.o: ./vic20/via1.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/vmachine.h include/via.h include/types.h include/resources.h \ + include/true1541.h include/drive.h include/fs_cbm.h include/serial.h \ + include/1541cpu.h arch/msdos/kbd.h include/interrupt.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h + ./vic20/via2.o: ./vic20/via2.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/vmachine.h include/via.h include/types.h include/resources.h \ + include/true1541.h include/drive.h include/fs_cbm.h include/serial.h \ + include/1541cpu.h arch/msdos/kbd.h include/interrupt.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h + ./vic20/vic20mem.o: ./vic20/vic20mem.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + vic20/vic20mem.h include/types.h include/vmachine.h \ + include/interrupt.h include/6510core.h include/resources.h \ + $(DJDIR)/include/stdlib.h include/memutils.h include/maincpu.h \ + include/mem.h include/via.h include/vic.h arch/msdos/video.h \ + $(DJDIR)/include/pc.h $(DJDIR)/include/inlines/pc.h \ + $(DJDIR)/include/allegro.h $(DJDIR)/include/stddef.h \ + $(DJDIR)/include/errno.h $(DJDIR)/include/dpmi.h + ./vic20/vic.o: ./vic20/vic.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdio.h include/vic.h arch/msdos/video.h \ + $(DJDIR)/include/pc.h $(DJDIR)/include/inlines/pc.h \ + $(DJDIR)/include/allegro.h $(DJDIR)/include/stddef.h \ + $(DJDIR)/include/errno.h $(DJDIR)/include/dpmi.h include/types.h \ + include/vmachine.h include/interrupt.h include/6510core.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + include/raster.h include/sid.h include/mem.h vic20/vic20mem.h \ + raster.c $(DJDIR)/include/sys/time.h $(DJDIR)/include/time.h \ + $(DJDIR)/include/sys/types.h $(DJDIR)/include/signal.h \ + $(DJDIR)/include/unistd.h $(DJDIR)/include/stdarg.h \ + include/resources.h arch/msdos/vsync.h + ./pet/viap.o: ./pet/viap.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + include/vmachine.h include/via.h include/types.h include/resources.h \ + include/parallel.h include/sid.h arch/msdos/kbd.h include/crtc.h \ + arch/msdos/video.h $(DJDIR)/include/pc.h \ + $(DJDIR)/include/inlines/pc.h $(DJDIR)/include/allegro.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/stddef.h \ + $(DJDIR)/include/errno.h $(DJDIR)/include/dpmi.h include/interrupt.h \ + include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h + ./pet/petmem.o: ./pet/petmem.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + include/types.h include/mem.h pet/petmem.h include/memutils.h \ + include/pia.h include/via.h include/crtc.h arch/msdos/video.h \ + $(DJDIR)/include/pc.h $(DJDIR)/include/inlines/pc.h \ + $(DJDIR)/include/allegro.h $(DJDIR)/include/stdlib.h \ + $(DJDIR)/include/stddef.h $(DJDIR)/include/errno.h \ + $(DJDIR)/include/dpmi.h arch/msdos/kbd.h include/resources.h \ + pet/pets.h include/interrupt.h include/vmachine.h include/6510core.h \ + $(DJDIR)/include/string.h $(DJDIR)/include/sys/movedata.h \ + include/maincpu.h + ./pet/crtc.o: ./pet/crtc.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdlib.h $(DJDIR)/include/sys/djtypes.h \ + $(DJDIR)/include/stdio.h include/crtc.h include/types.h \ + arch/msdos/video.h $(DJDIR)/include/pc.h \ + $(DJDIR)/include/inlines/pc.h $(DJDIR)/include/allegro.h \ + $(DJDIR)/include/stddef.h $(DJDIR)/include/errno.h \ + $(DJDIR)/include/dpmi.h include/raster.h include/vmachine.h \ + include/interrupt.h include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h include/mem.h pet/petmem.h \ + include/pia.h raster.c $(DJDIR)/include/sys/time.h \ + $(DJDIR)/include/time.h $(DJDIR)/include/sys/types.h \ + $(DJDIR)/include/signal.h $(DJDIR)/include/unistd.h \ + $(DJDIR)/include/stdarg.h include/resources.h arch/msdos/vsync.h + ./pet/pets.o: ./pet/pets.c include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + $(DJDIR)/include/stdio.h $(DJDIR)/include/sys/djtypes.h \ + include/resources.h pet/pets.h + ./pet/pia.o: ./pet/pia.c $(DJDIR)/include/stdio.h \ + $(DJDIR)/include/sys/djtypes.h $(DJDIR)/include/time.h \ + $(DJDIR)/include/sys/types.h include/vice.h include/autoconf.h \ + $(DJDIR)/include/limits.h $(DJDIR)/include/sys/param.h \ + include/types.h include/vmachine.h include/parallel.h \ + arch/msdos/kbd.h include/resources.h include/pia.h \ + include/interrupt.h include/6510core.h $(DJDIR)/include/string.h \ + $(DJDIR)/include/sys/movedata.h diff -dpPrTC3 /vice-0.14-2/src/Makefile.in vice0142/src/Makefile.in *** /vice-0.14-2/src/Makefile.in Sun Mar 29 21:22:20 1998 --- vice0142/src/Makefile.in Mon Apr 13 21:40:04 1998 *************** TOPDIR = $(BASEDIR)/.. *** 21,35 **** SRCDIR = $(BASEDIR) UNIXDIR = $(SRCDIR)/arch/unix - UNIXODIR = ./arch/unix READLINEDIR = $(UNIXDIR)/readline WIDGETDIR = $(UNIXDIR)/widgets ! READLINEODIR = $(UNIXODIR)/readline ! WIDGETODIR = $(UNIXODIR)/widgets MSDOSDIR = $(SRCDIR)/arch/msdos - MSDOSODIR = ./arch/msdos ARCHDIR = @ARCHDIR@ - ARCHODIR = @ARCHODIR@ C64DIR = $(SRCDIR)/c64 C64ODIR = ./c64 --- 21,32 ---- SRCDIR = $(BASEDIR) UNIXDIR = $(SRCDIR)/arch/unix READLINEDIR = $(UNIXDIR)/readline WIDGETDIR = $(UNIXDIR)/widgets ! READLINEODIR = ./arch/unix/readline ! WIDGETODIR = ./arch/unix/widgets MSDOSDIR = $(SRCDIR)/arch/msdos ARCHDIR = @ARCHDIR@ C64DIR = $(SRCDIR)/c64 C64ODIR = ./c64 *************** MSDOSDIST = $(MSDOSSRC) $(MSDOSHDR) *** 185,191 **** ## Readline sources READLINESRC = $(READLINEDIR)/complete.c $(READLINEDIR)/editline.c \ ! $(READLINEDIR)/editline2.c $(READLINEDIR)/sysos9.c \ $(READLINEDIR)/sysunix.c $(READLINEDIR)/testit.c \ $(READLINEDIR)/version.c --- 182,188 ---- ## Readline sources READLINESRC = $(READLINEDIR)/complete.c $(READLINEDIR)/editline.c \ ! $(READLINEDIR)/editlin2.c $(READLINEDIR)/sysos9.c \ $(READLINEDIR)/sysunix.c $(READLINEDIR)/testit.c \ $(READLINEDIR)/version.c *************** WIDGETSRC = $(WIDGETDIR)/Canvas.c $(WIDG *** 209,218 **** WIDGETHDR = $(WIDGETDIR)/Canvas.h $(WIDGETDIR)/CanvasP.h \ $(WIDGETDIR)/DirMgr.h $(WIDGETDIR)/Directory.h $(WIDGETDIR)/FileSel.h \ $(WIDGETDIR)/FileSelP.h $(WIDGETDIR)/MultiList.h \ ! $(WIDGETDIR)/MultiListP.h $(WIDGETDIR)/RegExp.h \ $(WIDGETDIR)/ScrList.h $(WIDGETDIR)/ScrListP.h \ $(WIDGETDIR)/TabString.h $(WIDGETDIR)/TextField.h \ ! $(WIDGETDIR)/TextFieldP.h WIDGETMISC = $(WIDGETDIR)/Makefile.in $(WIDGETDIR)/autoconf.h.in --- 206,215 ---- WIDGETHDR = $(WIDGETDIR)/Canvas.h $(WIDGETDIR)/CanvasP.h \ $(WIDGETDIR)/DirMgr.h $(WIDGETDIR)/Directory.h $(WIDGETDIR)/FileSel.h \ $(WIDGETDIR)/FileSelP.h $(WIDGETDIR)/MultiList.h \ ! $(WIDGETDIR)/MultiLiP.h $(WIDGETDIR)/RegExp.h \ $(WIDGETDIR)/ScrList.h $(WIDGETDIR)/ScrListP.h \ $(WIDGETDIR)/TabString.h $(WIDGETDIR)/TextField.h \ ! $(WIDGETDIR)/TextFieP.h WIDGETMISC = $(WIDGETDIR)/Makefile.in $(WIDGETDIR)/autoconf.h.in *************** PETROMS = $(PETROMDIR)/pet2001 $(PETROMD *** 268,273 **** --- 265,271 ---- # x64/xvic/xpet (l)objects are produced in the obj/{c64|vic20|pet} dir. # + SYSPEC_OBJS = @SYSPEC_OBJS@ X64_SYSPEC_OBJS = @X64_SYSPEC_OBJS@ XVIC_SYSPEC_OBJS = @XVIC_SYSPEC_OBJS@ XPET_SYSPEC_OBJS = @XPET_SYSPEC_OBJS@ *************** XPET_SYSPEC_OBJS = @XPET_SYSPEC_OBJS@ *** 275,281 **** JOY_OBJS = @JOY_OBJS@ COMMON_OBJS = charsets.o info.o mshell.o tape.o warn.o utils.o zfile.o \ ! memutils.o drive.o asm.o @SYSPEC_OBJS@ @LIBOBJS@ COMMON_LIBS = @COMMON_LIBS@ --- 273,279 ---- JOY_OBJS = @JOY_OBJS@ COMMON_OBJS = charsets.o info.o mshell.o tape.o warn.o utils.o zfile.o \ ! memutils.o drive.o asm.o @LIBOBJS@ COMMON_LIBS = @COMMON_LIBS@ *************** TRUE1541_OBJS = viad1.o viad2.o 1541cpu *** 283,319 **** PARALLEL_OBJS = parallel.o ! C64_OBJS = main.o maincpu.o misc.o mon.o patchrom.o \ ! reu.o resources.o serial.o tapeunit.o tpi.o traps.o true1541.o sid.o \ ! $(X64_SYSPEC_OBJS) C64_LOBJS = $(C64ODIR)/cia1.o $(C64ODIR)/cia2.o $(C64ODIR)/c64mem.o \ $(C64ODIR)/vicii.o $(C64ODIR)/autostart.o ! VIC20_OBJS = maincpu_VIC20.o main_VIC20.o \ ! misc_VIC20.o mon_VIC20.o resources_VIC20.o \ ! serial_VIC20.o tapeunit_VIC20.o true1541_VIC20.o \ ! sid_VIC20.o traps_VIC20.o $(XVIC_SYSPEC_OBJS) VIC20_LOBJS = $(VICODIR)/via1.o $(VICODIR)/via2.o $(VICODIR)/vic20mem.o \ $(VICODIR)/vic.o ! PET_OBJS = maincpu_PET.o main_PET.o \ ! misc_PET.o mon_PET.o resources_PET.o \ ! serial_PET.o sid_PET.o traps_PET.o \ ! $(XPET_SYSPEC_OBJS) PET_LOBJS = $(PETODIR)/viap.o $(PETODIR)/petmem.o $(PETODIR)/crtc.o \ $(PETODIR)/pets.o $(PETODIR)/pia.o ! C64_DEPS = $(C64_OBJS) $(JOY_OBJS) $(PARALLEL_OBJS) $(TRUE1541_OBJS) \ ! $(COMMON_OBJS) $(C64_LOBJS) $(COMMON_LIBS) ! VIC_DEPS = $(VIC20_OBJS) $(JOY_OBJS) $(TRUE1541_OBJS) \ ! $(COMMON_OBJS) $(VIC20_LOBJS) $(COMMON_LIBS) ! PET_DEPS = $(PET_OBJS) $(PARALLEL_OBJS) $(COMMON_OBJS) $(PET_LOBJS) \ ! $(COMMON_LIBS) $(JOY_OBJS) C1541_OBJS = c1541.o --- 281,321 ---- PARALLEL_OBJS = parallel.o ! C64_OBJS = $(C64ODIR)/main.o $(C64ODIR)/maincpu.o $(C64ODIR)/misc.o \ ! $(C64ODIR)/mon.o $(C64ODIR)/patchrom.o $(C64ODIR)/reu.o \ ! $(C64ODIR)/resources.o $(C64ODIR)/serial.o \ ! $(C64ODIR)/tapeunit.o $(C64ODIR)/tpi.o $(C64ODIR)/traps.o \ ! $(C64ODIR)/true1541.o $(C64ODIR)/sid.o C64_LOBJS = $(C64ODIR)/cia1.o $(C64ODIR)/cia2.o $(C64ODIR)/c64mem.o \ $(C64ODIR)/vicii.o $(C64ODIR)/autostart.o ! VIC20_OBJS = $(VICODIR)/maincpu.o $(VICODIR)/main.o \ ! $(VICODIR)/misc.o $(VICODIR)/mon.o $(VICODIR)/resources.o \ ! $(VICODIR)/serial.o $(VICODIR)/tapeunit.o $(VICODIR)/true1541.o \ ! $(VICODIR)/sid.o $(VICODIR)/traps.o VIC20_LOBJS = $(VICODIR)/via1.o $(VICODIR)/via2.o $(VICODIR)/vic20mem.o \ $(VICODIR)/vic.o ! PET_OBJS = $(PETODIR)/maincpu.o $(PETODIR)/main.o \ ! $(PETODIR)/misc.o $(PETODIR)/mon.o $(PETODIR)/resources.o \ ! $(PETODIR)/serial.o $(PETODIR)/sid.o $(PETODIR)/traps.o PET_LOBJS = $(PETODIR)/viap.o $(PETODIR)/petmem.o $(PETODIR)/crtc.o \ $(PETODIR)/pets.o $(PETODIR)/pia.o ! C64_DEPS = $(C64_OBJS) $(X64_SYSPEC_OBJS) $(JOY_OBJS) $(PARALLEL_OBJS) \ ! $(TRUE1541_OBJS) $(COMMON_OBJS) $(SYSPEC_OBJS) $(C64_LOBJS) \ ! $(COMMON_LIBS) ! VIC_DEPS = $(VIC20_OBJS) $(XVIC_SYSPEC_OBJS) $(JOY_OBJS) \ ! $(TRUE1541_OBJS) $(COMMON_OBJS) $(SYSPEC_OBJS) $(VIC20_LOBJS) \ ! $(COMMON_LIBS) ! PET_DEPS = $(PET_OBJS) $(XPET_SYSPEC_OBJS) $(PARALLEL_OBJS) \ ! $(COMMON_OBJS) $(SYSPEC_OBJS) $(PET_LOBJS) $(COMMON_LIBS) \ ! $(JOY_OBJS) C1541_OBJS = c1541.o *************** PETCAT_OBJS = petcat.o *** 324,332 **** PETCAT_DEPS = $(PETCAT_OBJS) charsets.o tape.o utils.o zfile.o ! VICEOBJS = $(COMMON_OBJS) $(C64_OBJS) $(VIC20_OBJS) $(PET_OBJS) $(C1541_OBJS) \ ! $(PETCAT_OBJS) $(TRUE1541_OBJS) $(PARALLEL_OBJS) $(JOY_OBJS) \ ! $(C64_LOBJS) $(VIC20_LOBJS) $(PET_LOBJS) EMUBIN = $(BINDIR)/x64 $(BINDIR)/xvic $(BINDIR)/xpet --- 326,336 ---- PETCAT_DEPS = $(PETCAT_OBJS) charsets.o tape.o utils.o zfile.o ! VICEOBJS = $(COMMON_OBJS) $(SYSPEC_OBJS) $(C64_OBJS) \ ! $(X64_SYSPEC_OBJS) $(VIC20_OBJS) $(XVIC_SYSPEC_OBJS) \ ! $(PET_OBJS) $(XPET_SYSPEC_OBJS) $(C1541_OBJS) $(PETCAT_OBJS) \ ! $(TRUE1541_OBJS) $(PARALLEL_OBJS) $(JOY_OBJS) $(C64_LOBJS) \ ! $(VIC20_LOBJS) $(PET_LOBJS) EMUBIN = $(BINDIR)/x64 $(BINDIR)/xvic $(BINDIR)/xpet *************** TARGET = $(EMUBIN) $(UTILBIN) *** 338,344 **** ### Default target (build everything) .PHONY: all ! all: $(EMUBIN) $(UTILBIN) ### Default rule for building C object files. --- 342,348 ---- ### Default target (build everything) .PHONY: all ! all: $(TARGET) ### Default rule for building C object files. *************** all: $(EMUBIN) $(UTILBIN) *** 352,364 **** $(COMMON_OBJS) $(TRUE1541_OBJS) $(PARALLEL_OBJS) $(C1541_OBJS) $(PETCAT_OBJS): $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) ### `widget' and `readline' libraries $(READLINE): ! cd $(READLINEODIR); $(MAKE) $(WIDGETS): ! cd $(WIDGETODIR); $(MAKE) ### x64 --- 356,371 ---- $(COMMON_OBJS) $(TRUE1541_OBJS) $(PARALLEL_OBJS) $(C1541_OBJS) $(PETCAT_OBJS): $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) + $(SYSPEC_OBJS): + $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@:.o=.c) + ### `widget' and `readline' libraries $(READLINE): ! $(MAKE) -C $(READLINEODIR) $(WIDGETS): ! $(MAKE) -C $(WIDGETODIR) ### x64 *************** $(BINDIR)/x64: $(C64_DEPS) *** 371,377 **** # rm -f ./x64; $(LN_S) $(BINDIR)/x64 ./x64 $(C64_OBJS): ! $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) $(C64_LOBJS): $(CC) -DCBM64 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) --- 378,387 ---- # rm -f ./x64; $(LN_S) $(BINDIR)/x64 ./x64 $(C64_OBJS): ! $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@F:.o=.c) ! ! $(X64_SYSPEC_OBJS): ! $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@F:.o=.c) $(C64_LOBJS): $(CC) -DCBM64 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) *************** $(BINDIR)/xvic: $(VIC_DEPS) *** 393,399 **** # rm -f ./xvic; $(LN_S) $(BINDIR)/xvic ./xvic $(VIC20_OBJS): ! $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:_VIC20.o=.c) $(VIC20_LOBJS): $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) --- 403,412 ---- # rm -f ./xvic; $(LN_S) $(BINDIR)/xvic ./xvic $(VIC20_OBJS): ! $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@F:.o=.c) ! ! $(XVIC_SYSPEC_OBJS): ! $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@F:.o=.c) $(VIC20_LOBJS): $(CC) -DVIC20 $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) *************** $(BINDIR)/xpet: $(PET_DEPS) *** 415,421 **** # rm -rf ./xpet; $(LN_S) $(BINDIR)/xpet ./xpet $(PET_OBJS): ! $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:_PET.o=.c) $(PET_LOBJS): $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) --- 428,437 ---- # rm -rf ./xpet; $(LN_S) $(BINDIR)/xpet ./xpet $(PET_OBJS): ! $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@F:.o=.c) ! ! $(XPET_SYSPEC_OBJS): ! $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(ARCHDIR)/$(@F:.o=.c) $(PET_LOBJS): $(CC) -DPET $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ -c $(SRCDIR)/$(@:.o=.c) *************** uninstall: VERSION *** 591,601 **** .PHONY: clean clean: ! (cd $(READLINEODIR); $(MAKE) clean) ! (cd $(WIDGETODIR); $(MAKE) clean) rm -f *~ *.bak TAGS *.o - (cd $(UNIXODIR); rm -f *~ *.bak TAGS *.o) - (cd $(MSDOSODIR); rm -f *~ *.bak TAGS *.o) (cd $(C64ODIR); rm -f *~ *.bak TAGS *.o) (cd $(PETODIR); rm -f *~ *.bak TAGS *.o) (cd $(VICODIR); rm -f *~ *.bak TAGS *.o) --- 607,615 ---- .PHONY: clean clean: ! $(MAKE) -C $(READLINEODIR) clean ! $(MAKE) -C $(WIDGETODIR clean rm -f *~ *.bak TAGS *.o (cd $(C64ODIR); rm -f *~ *.bak TAGS *.o) (cd $(PETODIR); rm -f *~ *.bak TAGS *.o) (cd $(VICODIR); rm -f *~ *.bak TAGS *.o) *************** clean: *** 603,610 **** .PHONY: mrproper mrproper: clean ! (cd $(WIDGETODIR); $(MAKE) mrproper) ! (cd $(READLINEODIR); $(MAKE) mrproper) rm -f config.cache config.log config.status Makefile Makefile.old \ include/autoconf.h VERSION rm -f c1541 petcat x64 xpet xvic --- 617,624 ---- .PHONY: mrproper mrproper: clean ! $(MAKE) -C $(WIDGETODIR) mrproper ! $(MAKE) -C $(READLINEODIR) mrproper rm -f config.cache config.log config.status Makefile Makefile.old \ include/autoconf.h VERSION rm -f c1541 petcat x64 xpet xvic diff -dpPrTC3 /vice-0.14-2/src/memutils.c vice0142/src/memutils.c *** /vice-0.14-2/src/memutils.c Sun Mar 8 20:56:16 1998 --- vice0142/src/memutils.c Mon Apr 13 14:22:08 1998 *************** *** 45,51 **** --- 45,53 ---- static const char *create_name(const char *path, const char *name) { static char buffer[2048]; + #ifndef __MSDOS__ static char *home = NULL; + #endif const char *p; if (!path && !name) diff -dpPrTC3 /vice-0.14-2/src/mkdep vice0142/src/mkdep *** /vice-0.14-2/src/mkdep Mon Nov 17 21:56:38 1997 --- vice0142/src/mkdep Mon Apr 13 17:48:10 1998 *************** *** 8,18 **** # *.o files are handled by calling cpp as usual on the corresponding .c # file # ! # *_VIC20.o files are considered VIC20-specific objects and create ! # the dependence with the corresponding .c file with `VIC20' defined # ! # *_PET.o files are considered VIC20-specific objects and create ! # the dependence with the corresponding .c file with `PET' defined # # other files are ignored # --- 8,18 ---- # *.o files are handled by calling cpp as usual on the corresponding .c # file # ! # VIC20/*.o files are considered VIC20-specific objects and create the ! # dependence with the corresponding .c file with `VIC20' defined # ! # PET/*.o files are considered VIC20-specific objects and create the ! # dependence with the corresponding .c file with `PET' defined # # other files are ignored # *************** magic="# DO NOT DELETE" *** 25,46 **** makefile="Makefile" # Put the magic string at the very start of the new dependencies. ! echo $magic > .depend for a in $* ; do pref=${SRCDIR} case $a in ! *_VIC20.o ) ! src="$SRCDIR"/`echo $a | sed 's/_VIC20\.o$/.c/'` if [ ! -f "$src" ] ; then continue fi defines="-DVIC20" ;; ! *_PET.o ) ! src="$SRCDIR"/`echo $a | sed 's/_PET\.o$/.c/'` if [ ! -f "$src" ] ; then continue fi --- 25,46 ---- makefile="Makefile" # Put the magic string at the very start of the new dependencies. ! echo $magic > _depend for a in $* ; do pref=${SRCDIR} case $a in ! VIC20/*.o ) ! src="$SRCDIR"/`echo $a | sed 's:VIC20/\(.*\)\.o$:\1.c:'` if [ ! -f "$src" ] ; then continue fi defines="-DVIC20" ;; ! PET/*.o ) ! src="$SRCDIR"/`echo $a | sed 's:PET/\(.*\)\.o$:\1.c:'` if [ ! -f "$src" ] ; then continue fi *************** for a in $* ; do *** 64,78 **** obj=`basename $src | sed 's/\.c$/.o/' | sed 's/\//\\\\\//g' | sed 's/\./\\\\./'` nobj=`echo $a | sed 's/\//\\\\\//g' | sed 's/\./\\\\./'` ! ( $CPP $INCLUDES $defines -M $src | sed "s/$obj/$nobj/" ) >> .depend done ! # The .depend file has been built, now create the new makefile. mv $makefile ${makefile}.old # Remove everything from the magic string to the end of the file, # and add the new dependencies to the end. ! ( sed -e "/^$magic/,\$d" < ${makefile}.old | cat - .depend ) > $makefile ! rm -f .depend --- 64,78 ---- obj=`basename $src | sed 's/\.c$/.o/' | sed 's/\//\\\\\//g' | sed 's/\./\\\\./'` nobj=`echo $a | sed 's/\//\\\\\//g' | sed 's/\./\\\\./'` ! ( $CPP $INCLUDES $defines -M $src | sed "s/$obj/$nobj/" ) >> _depend done ! # The _depend file has been built, now create the new makefile. mv $makefile ${makefile}.old # Remove everything from the magic string to the end of the file, # and add the new dependencies to the end. ! ( sed -e "/^$magic/,\$d" < ${makefile}.old | cat - _depend ) > $makefile ! rm -f _depend diff -dpPrTC3 /vice-0.14-2/src/sid.c vice0142/src/sid.c *** /vice-0.14-2/src/sid.c Tue Mar 31 21:07:58 1998 --- vice0142/src/sid.c Mon Apr 13 15:55:26 1998 *************** BYTE REGPARM1 read_sid(ADDRESS addr) *** 2660,2666 **** { BYTE ret; u32_t ffix; ! register u32_t rvstore; register CLOCK tmp; run_sid(); addr &= 0x1f; --- 2660,2666 ---- { BYTE ret; u32_t ffix; ! register u32_t rvstore = 0; register CLOCK tmp; run_sid(); addr &= 0x1f; diff -dpPrTC3 /vice-0.14-2/src/tapeunit.c vice0142/src/tapeunit.c *** /vice-0.14-2/src/tapeunit.c Sat Mar 7 15:02:10 1998 --- vice0142/src/tapeunit.c Mon Apr 13 14:26:16 1998 *************** static int is_valid_prgfile(FILE *fd) *** 353,359 **** int attach_tape_image (TAPE *tape, const char *name, int mode) { char realname[24]; ! int realtype = FT_PRG, reclen = 0; int format = -1, entries = 0; long flen; --- 353,362 ---- int attach_tape_image (TAPE *tape, const char *name, int mode) { char realname[24]; ! #ifdef DEBUG_TAPE ! int realtype = FT_PRG; ! #endif ! int reclen = 0; int format = -1, entries = 0; long flen; *************** static int fn() *** 550,556 **** static void findheader (void) { ! BYTE *s, buf[2]; int start, end; int sense = 0; int err = 0; --- 553,559 ---- static void findheader (void) { ! BYTE *s; int start, end; int sense = 0; int err = 0;