From 0ac263b432e980c999f004e49b78cc7e24130473 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 26 Dec 2020 23:15:47 +0700 Subject: [PATCH 1/2] Always follow NEW_STORAGE code paths. This removes the code paths for the pre-NEW_STORAGE code. --- inc/ifpage.h | 24 ------------------------ inc/version.h | 8 ++++++++ src/initsout.c | 6 ------ src/ldsout.c | 4 ---- src/main.c | 2 -- src/tstsout.c | 2 -- src/vmemsave.c | 2 -- 7 files changed, 8 insertions(+), 40 deletions(-) diff --git a/inc/ifpage.h b/inc/ifpage.h index 2adcc702..b3c077f7 100755 --- a/inc/ifpage.h +++ b/inc/ifpage.h @@ -64,13 +64,8 @@ typedef struct ifpage { DLword mdszonelength; DLword emubuffers; DLword emubuflength; -#ifdef NEW_STORAGE DLword ex_process_size; /* was lastnumchars */ DLword storagefullstate; /* was sysdisk */ -#else - DLword lastnumchars; - DLword sysdisk; -#endif /* NEW_STORAGE */ DLword isfmap; /* these are for \miscapply * -- note that they are not ref counted, so don't pass the only pointer @@ -152,13 +147,8 @@ typedef struct ifpage { DLword mdszonelength; DLword emubuffers; DLword emubuflength; -#ifdef NEW_STORAGE DLword process_size; /* was lastnumchars */ DLword storagefullstate; /* was sysdisk */ -#else - DLword lastnumchars; - DLword sysdisk; -#endif /* NEW_STORAGE */ DLword isfmap; /* these are for \miscapply * -- note that they are not ref counted, so don't pass the only pointer @@ -230,17 +220,10 @@ typedef struct ifpage { DLword nshost2; /* hi word */ DLword emubuffers; DLword mdszonelength; /* hi word */ -#ifdef NEW_STORAGE DLword ex_process_size; DLword emubuflength; /* hi word */ DLword isfmap; DLword storagefullstate; /* hi word */ -#else - DLword lastnumchars; - DLword emubuflength; /* hi word */ - DLword isfmap; - DLword sys_disk; /* hi word */ -#endif /* NEW_STORAGE */ /* these are for \miscapply * -- note that they are not ref counted, so don't pass the only pointer * to something this way */ @@ -322,17 +305,10 @@ typedef struct ifpage { DLword nshost2; /* hi word */ DLword emubuffers; DLword mdszonelength; /* hi word */ -#ifdef NEW_STORAGE DLword process_size; DLword emubuflength; /* hi word */ DLword isfmap; DLword storagefullstate; /* hi word */ -#else - DLword lastnumchars; - DLword emubuflength; /* hi word */ - DLword isfmap; - DLword sys_disk; /* hi word */ -#endif /* NEW_STORAGE */ /* these are for \miscapply * -- note that they are not ref counted, so don't pass the only pointer * to something this way */ diff --git a/inc/version.h b/inc/version.h index 747ad9ba..ccc4969a 100755 --- a/inc/version.h +++ b/inc/version.h @@ -151,6 +151,14 @@ error Must specify RELEASE to build Medley. + /****************************************************************/ + /* */ + /* There used to be a define NEW_STORAGE, but this wasn't tied */ + /* clearly to any RELEASE values. There are comments related */ + /* to this in LLPARAMS on the Lisp side. */ + /* */ + /****************************************************************/ + /****************************************************************/ /* */ /* Architecture-specific flags: Set flags */ diff --git a/src/initsout.c b/src/initsout.c index 8830bbaf..f7b2ea80 100644 --- a/src/initsout.c +++ b/src/initsout.c @@ -108,10 +108,8 @@ LispPTR *fixp_value(LispPTR *ptr) { void init_ifpage(int sysout_size) { extern long MDate; extern int DisplayType; -#ifdef NEW_STORAGE extern int Storage_expanded; int new_lastvmem; -#endif /* Initialize IFPAGE */ @@ -122,7 +120,6 @@ void init_ifpage(int sysout_size) { #endif /* NOETHER */ /*InterfacePage->dl24bitaddressable = (sysout_size == 32? 0xffff : 0);*/ InterfacePage->dl24bitaddressable = (sysout_size == 8 ? 0 : 0xffff); -#ifdef NEW_STORAGE new_lastvmem = (sysout_size * PAGES_IN_MBYTE) - 1; if ((!Storage_expanded) && (InterfacePage->dllastvmempage != new_lastvmem)) { @@ -135,9 +132,6 @@ void init_ifpage(int sysout_size) { } /* Set current process size */ InterfacePage->process_size = sysout_size; -#else - InterfacePage->dllastvmempage = LASTVMEMPAGE; -#endif /* NEW_STORAGE */ #ifdef BIGVM /* For BIGVM system, save the value in \LASTVMEMFILEPAGE for lisp's use */ diff --git a/src/ldsout.c b/src/ldsout.c index 447af11e..f81251a5 100644 --- a/src/ldsout.c +++ b/src/ldsout.c @@ -141,7 +141,6 @@ int sysout_loader(char * sysout_file_name, int sys_size) exit(-1); } #endif /* NOVERSION */ -#ifdef NEW_STORAGE if (sys_size == 0) /* use default or the previous one */ { if (ifpage.process_size == 0) /* Pure LISP.SYSOUT */ @@ -180,9 +179,6 @@ int sysout_loader(char * sysout_file_name, int sys_size) /* You can use secondary space , though it was STORAGEFULL So, STORAGEFULL may be set to NIL later */ } -#else - if (sys_size == 0) sys_size = DEFAULT_MAX_SYSOUTSIZE; -#endif /* NEW_STORAGE */ /* allocate Virtual Memory Space */ diff --git a/src/main.c b/src/main.c index 1fef340a..4f0a5f9a 100644 --- a/src/main.c +++ b/src/main.c @@ -532,9 +532,7 @@ int main(int argc, char *argv[]) init_ifpage(sysout_size); /* init interface page */ init_iopage(); init_miscstats(); -#ifdef NEW_STORAGE init_storage(); -#endif /* NEW_STORAGE */ set_cursor(); diff --git a/src/tstsout.c b/src/tstsout.c index 92cd40c5..ce0b2508 100644 --- a/src/tstsout.c +++ b/src/tstsout.c @@ -72,9 +72,7 @@ void check_sysout(char *sysout_file_name, int verbose) { if (verbose) { printf("ifpage.minbversion %d\n", ifpage.minbversion); printf("ifpage.process_size %d\n", ifpage.process_size); -#ifdef NEW_STORAGE printf("ifpage.storagefullstate %d\n", ifpage.storagefullstate); -#endif printf("ifpage.nactivepages %d\n", ifpage.nactivepages); } else { printf("%d", ifpage.minbversion); diff --git a/src/vmemsave.c b/src/vmemsave.c index 02f94d0d..b5f2b09a 100644 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -387,7 +387,6 @@ LispPTR vmem_save(char *sysout_file_name) InterfacePage->machinetype = KATANA; -#ifdef NEW_STORAGE /* Restore storagefull state */ if (((*STORAGEFULLSTATE_word) & 0xffff) == SFS_NOTSWITCHABLE) { /* This sysout uses only 8 Mbyte lisp space. @@ -402,7 +401,6 @@ LispPTR vmem_save(char *sysout_file_name) /* Otherwise, just restore storagefullstate in IFPAGE */ InterfacePage->storagefullstate = (*STORAGEFULLSTATE_word) & 0xffff; } -#endif /* NEW_STORAGE */ /* First, sort fptovp table, trying to get pages contiguous */ #ifndef BIGVM From 58b44d77e7f7a35da2f5dfbcbdc2d6438f7f014a Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 26 Dec 2020 23:20:16 +0700 Subject: [PATCH 2/2] Remove NEW_STORAGE from build system. The code no longer refers to `NEW_STORAGE`, so we can remove this from the build system. --- bin/dosmkfil | 2 +- bin/makefile-cygwin.x86_64-x | 2 +- bin/makefile-darwin.386-x | 2 +- bin/makefile-darwin.aarch64-x | 2 +- bin/makefile-darwin.x86_64-x | 2 +- bin/makefile-dos | 2 +- bin/makefile-freebsd.386-x | 2 +- bin/makefile-init.386 | 2 +- bin/makefile-linux.386-x | 2 +- bin/makefile-linux.armv7l-x | 2 +- bin/makefile-linux.x86_64-x | 2 +- bin/makefile-sunos3.mc68020 | 2 +- bin/makefile-sunos3.mc68020-x | 2 +- bin/makefile-sunos3.sparc | 2 +- bin/makefile-sunos4.1.i386 | 2 +- bin/makefile-sunos4.1.i386-multi | 2 +- bin/makefile-sunos4.1.mc68020 | 2 +- bin/makefile-sunos4.1.mc68020-multi | 2 +- bin/makefile-sunos4.1.mc68020-x | 2 +- bin/makefile-sunos4.1.sparc | 2 +- bin/makefile-sunos4.1.sparc-color | 2 +- bin/makefile-sunos4.1.sparc-multi | 2 +- bin/makefile-sunos4.1.sparc-x | 2 +- bin/makefile-sunos4.i386 | 2 +- bin/makefile-sunos4.i386-multi | 2 +- bin/makefile-sunos4.mc68020 | 2 +- bin/makefile-sunos4.mc68020-multi | 2 +- bin/makefile-sunos4.mc68020-x | 2 +- bin/makefile-sunos4.sparc | 2 +- bin/makefile-sunos4.sparc-3 | 2 +- bin/makefile-sunos4.sparc-color | 2 +- bin/makefile-sunos4.sparc-multi | 2 +- bin/makefile-sunos4.sparc-multi-3 | 2 +- bin/makefile-sunos4.sparc-x | 2 +- bin/makefile-sunos4.sparc-x-3 | 2 +- bin/makefile-sunos5.386-x | 2 +- bin/makefile-sunos5.i386-x | 2 +- bin/makefile-sunos5.sparc-x | 2 +- bin/makefile-sunos5.x86_64-x | 2 +- bin/makefile.dos | 2 +- bin/mkdos | 2 +- bin/mkfile | 2 +- bin/mkfile.c | 2 +- bin/mkfile.i | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/bin/dosmkfil b/bin/dosmkfil index b199ce6e..24dc6c16 100644 --- a/bin/dosmkfil +++ b/bin/dosmkfil @@ -8,7 +8,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj KEY = keytstno.obj -CFLAGS = -DBIGATOMS -DNEW_STORAGE -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ +CFLAGS = -DBIGATOMS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ -DNOFORN -DNOETHER -DNOVERSION -DLPSOLVE -g LDFLAGS = -g graphics.lib binmode.lib mouse.lib diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x index abcef978..1f5cf408 100644 --- a/bin/makefile-cygwin.x86_64-x +++ b/bin/makefile-cygwin.x86_64-x @@ -22,7 +22,7 @@ OEXT = .o OPTFLAGS = -O2 -g3 DISPOPTFLAGS = -O2 -g3 FPFLAGS = -DFLAGS = -DNEW_STORAGE -DLINUX -DAIX -DOLD_CURSOR \ +DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSYSVSIGNALS -DSYSVONLY \ -D_GNU_SOURCE diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index 042ff446..8bf7a9a0 100644 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -21,7 +21,7 @@ OPTFLAGS = -O2 -g DISPOPTFLAGS = -O2 -g FPFLAGS = DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ +DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index dfe3208f..4f99b723 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -21,7 +21,7 @@ OPTFLAGS = -O1 -g DISPOPTFLAGS = -O1 -g FPFLAGS = DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ +DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index 0bbcea61..51bd37af 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -21,7 +21,7 @@ OPTFLAGS = -O1 -g DISPOPTFLAGS = -O1 -g FPFLAGS = DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ +DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-dos b/bin/makefile-dos index b199ce6e..24dc6c16 100644 --- a/bin/makefile-dos +++ b/bin/makefile-dos @@ -8,7 +8,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj KEY = keytstno.obj -CFLAGS = -DBIGATOMS -DNEW_STORAGE -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ +CFLAGS = -DBIGATOMS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ -DNOFORN -DNOETHER -DNOVERSION -DLPSOLVE -g LDFLAGS = -g graphics.lib binmode.lib mouse.lib diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index 12172a6a..1ddad3fd 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -21,7 +21,7 @@ OEXT = .o OPTFLAGS = -O1 -gdwarf-2 DISPOPTFLAGS = -O1 -gdwarf-2 FPFLAGS = -DFLAGS = -DNEW_STORAGE -DFREEBSD -DOLD_CURSOR \ +DFLAGS = -DFREEBSD -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-init.386 b/bin/makefile-init.386 index bfe8f8f4..6ddc8402 100644 --- a/bin/makefile-init.386 +++ b/bin/makefile-init.386 @@ -20,7 +20,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT OPTFLAGS = -O0 -g DISPOPTFLAGS = -O0 -g FPFLAGS = -DFLAGS = -DNEW_STORAGE -DMACOSX -DOLD_CURSOR \ +DFLAGS = -DMACOSX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x index 2cac3558..50582e98 100644 --- a/bin/makefile-linux.386-x +++ b/bin/makefile-linux.386-x @@ -21,7 +21,7 @@ OEXT = .o OPTFLAGS = -O2 -g3 DISPOPTFLAGS = -O2 -g3 FPFLAGS = -DFLAGS = -DNEW_STORAGE -DLINUX -DAIX -DOLD_CURSOR \ +DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSYSVSIGNALS -DSYSVONLY \ -D_GNU_SOURCE diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index 2cac3558..50582e98 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -21,7 +21,7 @@ OEXT = .o OPTFLAGS = -O2 -g3 DISPOPTFLAGS = -O2 -g3 FPFLAGS = -DFLAGS = -DNEW_STORAGE -DLINUX -DAIX -DOLD_CURSOR \ +DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSYSVSIGNALS -DSYSVONLY \ -D_GNU_SOURCE diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x index abcef978..1f5cf408 100644 --- a/bin/makefile-linux.x86_64-x +++ b/bin/makefile-linux.x86_64-x @@ -22,7 +22,7 @@ OEXT = .o OPTFLAGS = -O2 -g3 DISPOPTFLAGS = -O2 -g3 FPFLAGS = -DFLAGS = -DNEW_STORAGE -DLINUX -DAIX -DOLD_CURSOR \ +DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \ -DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSYSVSIGNALS -DSYSVONLY \ -D_GNU_SOURCE diff --git a/bin/makefile-sunos3.mc68020 b/bin/makefile-sunos3.mc68020 index aa4fbdfb..4badc161 100644 --- a/bin/makefile-sunos3.mc68020 +++ b/bin/makefile-sunos3.mc68020 @@ -6,7 +6,7 @@ OEXT = .o OPTFLAGS = -O2 DISPOPTFLAGS = -O FPFLAGS = -f68881 -DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il BITBLTFILE = $(OBJECTDIR)bitblt68K.o diff --git a/bin/makefile-sunos3.mc68020-x b/bin/makefile-sunos3.mc68020-x index fd4217ef..87e7d330 100644 --- a/bin/makefile-sunos3.mc68020-x +++ b/bin/makefile-sunos3.mc68020-x @@ -33,7 +33,7 @@ OEXT = .o OPTFLAGS = -O2 DISPOPTFLAGS = -O FPFLAGS = -f68881 -DFLAGS = -DNEW_STORAGE -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS +DFLAGS = -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS LDFLAGS = -lX11 -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il BITBLTFILE = $(OBJECTDIR)bitblt68K.o diff --git a/bin/makefile-sunos3.sparc b/bin/makefile-sunos3.sparc index a02021ba..9039ccaa 100644 --- a/bin/makefile-sunos3.sparc +++ b/bin/makefile-sunos3.sparc @@ -6,7 +6,7 @@ OEXT = .o OPTFLAGS = -O2 FPFLAGS = # JRB - I'm not 100% sure about these flags; someone should check... -DFLAGS = -DKBINT -DNEW_STORAGE -DFLTINT -DSPARCDISP -DOS4_TYPE4BUG -DOLD_CURSOR -DSUNDISPLAY -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DFLTINT -DSPARCDISP -DOS4_TYPE4BUG -DOLD_CURSOR -DSUNDISPLAY -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm #-Dsparc? INLINE = $(SRCDIR)dispSPARC.il diff --git a/bin/makefile-sunos4.1.i386 b/bin/makefile-sunos4.1.i386 index 55175949..1c9926c8 100644 --- a/bin/makefile-sunos4.1.i386 +++ b/bin/makefile-sunos4.1.i386 @@ -5,7 +5,7 @@ OEXT = .o #For debugging OPTFLAGS = -g FPFLAGS = -DFLAGS = -DKBINT -DNEW_STORAGE -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY -DFORKCOMM +DFLAGS = -DKBINT -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY -DFORKCOMM LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp386i.il diff --git a/bin/makefile-sunos4.1.i386-multi b/bin/makefile-sunos4.1.i386-multi index 04d1aba6..31dbc55d 100644 --- a/bin/makefile-sunos4.1.i386-multi +++ b/bin/makefile-sunos4.1.i386-multi @@ -6,7 +6,7 @@ OEXT = .o OPTFLAGS = -O DISPOPTFLAGS = -O FPFLAGS = -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp386i.il BITBLTFILE=$(OBJECTDIR)bitblt386i.o diff --git a/bin/makefile-sunos4.1.mc68020 b/bin/makefile-sunos4.1.mc68020 index ffc1a91d..1533a8ea 100644 --- a/bin/makefile-sunos4.1.mc68020 +++ b/bin/makefile-sunos4.1.mc68020 @@ -10,7 +10,7 @@ FPFLAGS = -f68881 # [I remove DISPLAYBUFFER option . # You may run 'makeright multi'. -osamu '90/02/07] # NEWBITBLT for assembler version of bitblt. -DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il diff --git a/bin/makefile-sunos4.1.mc68020-multi b/bin/makefile-sunos4.1.mc68020-multi index 0cd27316..276935f2 100644 --- a/bin/makefile-sunos4.1.mc68020-multi +++ b/bin/makefile-sunos4.1.mc68020-multi @@ -11,7 +11,7 @@ DISPOPTFLAGS = -O FPFLAGS = -f68881 # DISPLAYBUFFER for Color Sparcstation code testing # NEWBITBLT for assembler version of bitblt. -DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il diff --git a/bin/makefile-sunos4.1.mc68020-x b/bin/makefile-sunos4.1.mc68020-x index 2dc6e052..cbf51375 100644 --- a/bin/makefile-sunos4.1.mc68020-x +++ b/bin/makefile-sunos4.1.mc68020-x @@ -37,7 +37,7 @@ FPFLAGS = -f68881 # [I remove DISPLAYBUFFER option . # You may run 'makeright x'. -osamu '90/02/27] # NEWBITBLT for assembler version of bitblt. -DFLAGS = -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS +DFLAGS = -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS LDFLAGS = -lX11 -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il diff --git a/bin/makefile-sunos4.1.sparc b/bin/makefile-sunos4.1.sparc index f5f889c5..e7216fee 100644 --- a/bin/makefile-sunos4.1.sparc +++ b/bin/makefile-sunos4.1.sparc @@ -9,7 +9,7 @@ DISPOPTFLAGS = -g FPFLAGS = # Now share the same ldesingle with COLOR(CG4)/MONO Suns # If you load MAIKOCOLOR.LCOM etc., you can use color functions -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS -DNOEUROKBD +DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS -DNOEUROKBD LDFLAGS = -lsuntool -lsunwindow -lpixrect -ldld -lc -lm # SPARC Assemble optimize check DFLAGS:sh += optck.sh ; true diff --git a/bin/makefile-sunos4.1.sparc-color b/bin/makefile-sunos4.1.sparc-color index 493f48e5..b8ea2875 100644 --- a/bin/makefile-sunos4.1.sparc-color +++ b/bin/makefile-sunos4.1.sparc-color @@ -6,7 +6,7 @@ OEXT = .o OPTFLAGS = -g FPFLAGS = # For COLOR, Add COLOR, remove OLD_CURSOR -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT -DFORKCOMM +DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT -DFORKCOMM LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm # SPARC Assemble optimize check DFLAGS:sh += optck.sh ; true diff --git a/bin/makefile-sunos4.1.sparc-multi b/bin/makefile-sunos4.1.sparc-multi index 60a1e004..3a05c7d0 100644 --- a/bin/makefile-sunos4.1.sparc-multi +++ b/bin/makefile-sunos4.1.sparc-multi @@ -14,7 +14,7 @@ FPFLAGS = # Now share the same ldemulti for Mono-Medley & Color-Medley # If you load MAIKOCOLOR.LCOM etc., you can use color functions -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS -DNOEUROKBD +DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS -DNOEUROKBD LDFLAGS = -lsuntool -lsunwindow -lpixrect -ldld -lc -lm # SPARC Assemble optimize check DFLAGS:sh += optck.sh ; true diff --git a/bin/makefile-sunos4.1.sparc-x b/bin/makefile-sunos4.1.sparc-x index f009cf99..244f5887 100644 --- a/bin/makefile-sunos4.1.sparc-x +++ b/bin/makefile-sunos4.1.sparc-x @@ -34,7 +34,7 @@ OPTFLAGS = -g DISPOPTFLAGS = -g FPFLAGS = -DFLAGS = -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS -DNOEUROKBD +DFLAGS = -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS -DNOEUROKBD LDFLAGS = -lX11 -lpixrect -lc -lm -ldld LDELDFLAGS = -Bstatic -lX11 -lpixrect -Bdynamic -lc -lm # SPARC Assemble optimize check diff --git a/bin/makefile-sunos4.i386 b/bin/makefile-sunos4.i386 index 55175949..1c9926c8 100644 --- a/bin/makefile-sunos4.i386 +++ b/bin/makefile-sunos4.i386 @@ -5,7 +5,7 @@ OEXT = .o #For debugging OPTFLAGS = -g FPFLAGS = -DFLAGS = -DKBINT -DNEW_STORAGE -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY -DFORKCOMM +DFLAGS = -DKBINT -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY -DFORKCOMM LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp386i.il diff --git a/bin/makefile-sunos4.i386-multi b/bin/makefile-sunos4.i386-multi index f725f4a3..083523ba 100644 --- a/bin/makefile-sunos4.i386-multi +++ b/bin/makefile-sunos4.i386-multi @@ -6,7 +6,7 @@ OEXT = .o OPTFLAGS = -O -traditional DISPOPTFLAGS = -O -traditional FPFLAGS = -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp386i.il BITBLTFILE=$(OBJECTDIR)bitblt386i.o diff --git a/bin/makefile-sunos4.mc68020 b/bin/makefile-sunos4.mc68020 index ffc1a91d..1533a8ea 100644 --- a/bin/makefile-sunos4.mc68020 +++ b/bin/makefile-sunos4.mc68020 @@ -10,7 +10,7 @@ FPFLAGS = -f68881 # [I remove DISPLAYBUFFER option . # You may run 'makeright multi'. -osamu '90/02/07] # NEWBITBLT for assembler version of bitblt. -DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il diff --git a/bin/makefile-sunos4.mc68020-multi b/bin/makefile-sunos4.mc68020-multi index 0cd27316..276935f2 100644 --- a/bin/makefile-sunos4.mc68020-multi +++ b/bin/makefile-sunos4.mc68020-multi @@ -11,7 +11,7 @@ DISPOPTFLAGS = -O FPFLAGS = -f68881 # DISPLAYBUFFER for Color Sparcstation code testing # NEWBITBLT for assembler version of bitblt. -DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm INLINE = $(SRCDIR)disp68K.il diff --git a/bin/makefile-sunos4.mc68020-x b/bin/makefile-sunos4.mc68020-x index 87fab8cb..503702e9 100644 --- a/bin/makefile-sunos4.mc68020-x +++ b/bin/makefile-sunos4.mc68020-x @@ -37,7 +37,7 @@ FPFLAGS = -f68881 # [I remove DISPLAYBUFFER option . # You may run 'makeright x'. -osamu '90/02/27] # NEWBITBLT for assembler version of bitblt. -DFLAGS = -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS +DFLAGS = -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS LDFLAGS = -lX11 -lpixrect -lc -lm LDELDFLAGS = -Bstatic -lX11 -lpixrect -Bdynamic -lc -lm diff --git a/bin/makefile-sunos4.sparc b/bin/makefile-sunos4.sparc index 03af1426..818dd55a 100644 --- a/bin/makefile-sunos4.sparc +++ b/bin/makefile-sunos4.sparc @@ -43,7 +43,7 @@ INLINEFLAGS = # -DSPARCDISP -DSUN4_OS4_IL DFLAGS = $(DEBUGFLAGS) \ $(MACHINEFLAGS) \ $(INLINEFLAGS) \ - -DKBINT -DNEW_STORAGE \ + -DKBINT \ -DRELEASE=350 LDFLAGS = -L$(LIBDIR) -lsuntool -lsunwindow -lpixrect -ldld -lc -lm diff --git a/bin/makefile-sunos4.sparc-3 b/bin/makefile-sunos4.sparc-3 index 730c5652..e7b388aa 100644 --- a/bin/makefile-sunos4.sparc-3 +++ b/bin/makefile-sunos4.sparc-3 @@ -17,7 +17,7 @@ OPTFLAGS = -O2 FPFLAGS = # Now share the same ldesingle with COLOR(CG4)/MONO Suns # If you load MAIKOCOLOR.LCOM etc., you can use color functions -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS +DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm #-Dsparc? INLINE = $(SRCDIR)dispSPARC.il diff --git a/bin/makefile-sunos4.sparc-color b/bin/makefile-sunos4.sparc-color index 73b629d8..c595d9c8 100644 --- a/bin/makefile-sunos4.sparc-color +++ b/bin/makefile-sunos4.sparc-color @@ -6,7 +6,7 @@ OEXT = .o OPTFLAGS = -g FPFLAGS = # For COLOR, Add COLOR, remove OLD_CURSOR -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT -DFORKCOMM +DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT -DFORKCOMM LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm #-Dsparc? diff --git a/bin/makefile-sunos4.sparc-multi b/bin/makefile-sunos4.sparc-multi index 7b726a36..c1af2768 100644 --- a/bin/makefile-sunos4.sparc-multi +++ b/bin/makefile-sunos4.sparc-multi @@ -48,7 +48,7 @@ INLINEFLAGS = # -DSPARCDISP -DSUN4_OS4_IL DFLAGS = $(DEBUGFLAGS) \ $(MACHINEFLAGS) \ $(INLINEFLAGS) \ - -DKBINT -DNEW_STORAGE \ + -DKBINT \ -DNOVERSION -DRELEASE=350 LDFLAGS = -L$(LIBDIR) -lsuntool -lsunwindow -lpixrect -ldld -lc -lm diff --git a/bin/makefile-sunos4.sparc-multi-3 b/bin/makefile-sunos4.sparc-multi-3 index 4e54467d..27eb3ece 100644 --- a/bin/makefile-sunos4.sparc-multi-3 +++ b/bin/makefile-sunos4.sparc-multi-3 @@ -17,7 +17,7 @@ FPFLAGS = # Removed for debug: -DSPARCDISP -DSUN4_OS4_IL # Added for debug: -DFNSTKCHECK -DMYOPTRACE -DOPTRACE -DNOASM # -DFLAGS = -DKBINT -DNEW_STORAGE -DOS4 -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DSPARCDISP -DSUN4_OS4_IL -DBIGATOMS -DFORKCOMM +DFLAGS = -DKBINT -DOS4 -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DSPARCDISP -DSUN4_OS4_IL -DBIGATOMS -DFORKCOMM LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm #-Dsparc? INLINE = $(SRCDIR)dispSPARC.il diff --git a/bin/makefile-sunos4.sparc-x b/bin/makefile-sunos4.sparc-x index 6e167599..4ac4c0b0 100644 --- a/bin/makefile-sunos4.sparc-x +++ b/bin/makefile-sunos4.sparc-x @@ -37,7 +37,7 @@ DFLAGS = $(DEBUGFLAGS) \ $(MACHINEFLAGS) \ $(INLINEFLAGS) \ $(XFLAGS) \ - -DKBINT -DNEW_STORAGE \ + -DKBINT \ -DNOVERSION -DRELEASE=200 diff --git a/bin/makefile-sunos4.sparc-x-3 b/bin/makefile-sunos4.sparc-x-3 index 89dab0cf..11d620c0 100644 --- a/bin/makefile-sunos4.sparc-x-3 +++ b/bin/makefile-sunos4.sparc-x-3 @@ -32,7 +32,7 @@ OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O2 FPFLAGS = -DFLAGS = -DNEW_STORAGE -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR \ +DFLAGS = -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR \ -DFORKCOMM -DNEWBITBLT -DLOGINT -DBIGATOMS $(XFLAGS) LDFLAGS = -lX11 -lpixrect -lc -lm # -Dsparc? diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x index 0c29e74a..52b1c41c 100644 --- a/bin/makefile-sunos5.386-x +++ b/bin/makefile-sunos5.386-x @@ -42,7 +42,7 @@ FPFLAGS = DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ - -DNEW_STORAGE -DOS5 \ + -DOS5 \ -DBYTESWAP -DSYSVSIGNALS \ -DOLD_CURSOR -DLOGINT \ -DNOPIXRECT -DFORKCOMM -DLOCK_X_UPDATES \ diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x index 44f94958..f02768cb 100644 --- a/bin/makefile-sunos5.i386-x +++ b/bin/makefile-sunos5.i386-x @@ -42,7 +42,7 @@ FPFLAGS = DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ - -DNEW_STORAGE -DOS5 -DAIX -DUSE_DLPI \ + -DOS5 -DAIX -DUSE_DLPI \ -DBYTESWAP \ -DOLD_CURSOR -DLOGINT \ -DNOPIXRECT -DFORKCOMM -DLOCK_X_UPDATES \ diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x index 5c543b2e..85e4b1fb 100644 --- a/bin/makefile-sunos5.sparc-x +++ b/bin/makefile-sunos5.sparc-x @@ -46,7 +46,7 @@ MAIN = main DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK MACHINEFLAGS = -DOS5 -DUSE_DLPI -DNOPIXRECT -DSYSVSIGNALS \ - -DOLD_CURSOR -DNEW_STORAGE -DLOGINT -DFORKCOMM -DLOCK_X_UPDATES + -DOLD_CURSOR -DLOGINT -DFORKCOMM -DLOCK_X_UPDATES INLINEFLAGS = diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x index af4855a5..e21e33a6 100644 --- a/bin/makefile-sunos5.x86_64-x +++ b/bin/makefile-sunos5.x86_64-x @@ -42,7 +42,7 @@ FPFLAGS = DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ - -DNEW_STORAGE -DOS5 \ + -DOS5 \ -DBYTESWAP -DSYSVSIGNALS \ -DOLD_CURSOR -DLOGINT \ -DNOPIXRECT -DFORKCOMM -DLOCK_X_UPDATES \ diff --git a/bin/makefile.dos b/bin/makefile.dos index a4a88229..03878dd8 100644 --- a/bin/makefile.dos +++ b/bin/makefile.dos @@ -8,7 +8,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj KEY = keytstno.obj -CFLAGS = -DBIGATOMS -DNEW_STORAGE -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ +CFLAGS = -DBIGATOMS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ -DNOFORN -DNOETHER -DNOVERSION -DBIGVM -DNEWCDRCODING LDFLAGS = -g graphics.lib binmode.lib mouse.lib diff --git a/bin/mkdos b/bin/mkdos index 5709a1b1..41ab7e43 100644 --- a/bin/mkdos +++ b/bin/mkdos @@ -46,7 +46,7 @@ ETHERFILES = ldeether.OEXT KEY = keytstno.OEXT -CFLAGS = -I. -DBIGATOMS -DNEW_STORAGE XFLAGS EXTRACFLAGS DEBUG +CFLAGS = -I. -DBIGATOMS XFLAGS EXTRACFLAGS DEBUG LDFLAGS = DEBUG EXTRALDFLAGS XLDFLAGS diff --git a/bin/mkfile b/bin/mkfile index 22179da6..0c4bbba4 100644 --- a/bin/mkfile +++ b/bin/mkfile @@ -51,7 +51,7 @@ ETHERFILES = ldeether.OEXT KEY = keytstno.OEXT -CFLAGS = -I. -DBIGATOMS -DNEW_STORAGE XFLAGS EXTRACFLAGS DEBUG +CFLAGS = -I. -DBIGATOMS XFLAGS EXTRACFLAGS DEBUG LDFLAGS = DEBUG EXTRALDFLAGS XLDFLAGS diff --git a/bin/mkfile.c b/bin/mkfile.c index 22179da6..0c4bbba4 100644 --- a/bin/mkfile.c +++ b/bin/mkfile.c @@ -51,7 +51,7 @@ ETHERFILES = ldeether.OEXT KEY = keytstno.OEXT -CFLAGS = -I. -DBIGATOMS -DNEW_STORAGE XFLAGS EXTRACFLAGS DEBUG +CFLAGS = -I. -DBIGATOMS XFLAGS EXTRACFLAGS DEBUG LDFLAGS = DEBUG EXTRALDFLAGS XLDFLAGS diff --git a/bin/mkfile.i b/bin/mkfile.i index 73a37aff..51daa894 100644 --- a/bin/mkfile.i +++ b/bin/mkfile.i @@ -24,7 +24,7 @@ ETHERFILES = ldeether.obj KEY = keytstno.obj -CFLAGS = -I. -DBIGATOMS -DNEW_STORAGE -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -DNOETHER -DBIGATOMS -DBIGVM -DNEWCDRCODING -O2 +CFLAGS = -I. -DBIGATOMS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -DNOETHER -DBIGATOMS -DBIGVM -DNEWCDRCODING -O2 LDFLAGS = -O2 graphics.lib binmode.lib mouse.lib