Skip to content

Commit 7a74d6e

Browse files
Control VM config via RELEASE. (#136)
When `RELEASE` is set, then `inc/version.h` configures some defines appropriately, including `BIGATOMS`, `BIGVM`, and `NEWCDRCODING`. There's no need to manage it directly on the compiler command line.
1 parent 3eb8d36 commit 7a74d6e

26 files changed

+33
-33
lines changed

bin/dosmkfil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj
88

99
KEY = keytstno.obj
1010

11-
CFLAGS = -DBIGATOMS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \
11+
CFLAGS = -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \
1212
-DNOFORN -DNOETHER -DNOVERSION -DLPSOLVE -g
1313

1414
LDFLAGS = -g graphics.lib binmode.lib mouse.lib
@@ -25,7 +25,7 @@ HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h
2525

2626

2727
bigvm:
28-
CFLAGS = $(CFLAGS) -DBIGVM -DNEWCDRCODRING
28+
CFLAGS = $(CFLAGS)
2929
make -f foot emul.exe
3030

3131
emul.exe : $(OFILES)

bin/makefile-dos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj
88

99
KEY = keytstno.obj
1010

11-
CFLAGS = -DBIGATOMS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \
11+
CFLAGS = -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \
1212
-DNOFORN -DNOETHER -DNOVERSION -DLPSOLVE -g
1313

1414
LDFLAGS = -g graphics.lib binmode.lib mouse.lib
@@ -25,7 +25,7 @@ HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h
2525

2626

2727
bigvm:
28-
CFLAGS = $(CFLAGS) -DBIGVM -DNEWCDRCODRING
28+
CFLAGS = $(CFLAGS)
2929
make -f foot emul.exe
3030

3131
emul.exe : $(OFILES)

bin/makefile-init.sparc-multi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FPFLAGS =
2121
# for bigatom work, removed -DSPARCDISP -DSUN4_OS4_IL
2222
DFLAGS = -DINIT -DKBINT -DOS4 -DOS4_TYPE4BUG -DCOLOR \
2323
-DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM \
24-
-DBIGATOMS -DNOASM -DNOFORN -DRELEASE=210 # -DNOVERSION -DRELEASE=201
24+
-DNOASM -DNOFORN -DRELEASE=210 # -DNOVERSION -DRELEASE=201
2525

2626
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
2727
#-Dsparc?

bin/makefile-sunos3.mc68020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OEXT = .o
66
OPTFLAGS = -O2
77
DISPOPTFLAGS = -O
88
FPFLAGS = -f68881
9-
DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
9+
DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
1010
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
1111
INLINE = $(SRCDIR)disp68K.il
1212
BITBLTFILE = $(OBJECTDIR)bitblt68K.o

bin/makefile-sunos3.mc68020-multi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
1111
FPFLAGS = -f68881
1212
# DISPLAYBUFFER for Color Sparcstation code testing
1313
# NEWBITBLT for assembler version of bitblt.
14-
DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
14+
DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
1515
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
1616

1717
INLINE = $(SRCDIR)disp68K.il

bin/makefile-sunos3.mc68020-x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ OEXT = .o
3333
OPTFLAGS = -O2
3434
DISPOPTFLAGS = -O
3535
FPFLAGS = -f68881
36-
DFLAGS = -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
36+
DFLAGS = -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM
3737
LDFLAGS = -lX11 -lpixrect -lc -lm
3838
INLINE = $(SRCDIR)disp68K.il
3939
BITBLTFILE = $(OBJECTDIR)bitblt68K.o

bin/makefile-sunos3.sparc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OEXT = .o
66
OPTFLAGS = -O2
77
FPFLAGS =
88
# JRB - I'm not 100% sure about these flags; someone should check...
9-
DFLAGS = -DKBINT -DFLTINT -DSPARCDISP -DOS4_TYPE4BUG -DOLD_CURSOR -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
9+
DFLAGS = -DKBINT -DFLTINT -DSPARCDISP -DOS4_TYPE4BUG -DOLD_CURSOR -DSUNDISPLAY -DFORKCOMM
1010
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
1111
#-Dsparc?
1212
INLINE = $(SRCDIR)dispSPARC.il

bin/makefile-sunos4.1.i386-multi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OEXT = .o
66
OPTFLAGS = -O
77
DISPOPTFLAGS = -O
88
FPFLAGS =
9-
DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM -DBIGATOMS
9+
DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM
1010
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
1111
INLINE = $(SRCDIR)disp386i.il
1212
BITBLTFILE=$(OBJECTDIR)bitblt386i.o

bin/makefile-sunos4.1.mc68020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FPFLAGS = -f68881
1010
# [I remove DISPLAYBUFFER option .
1111
# You may run 'makeright multi'. -osamu '90/02/07]
1212
# NEWBITBLT for assembler version of bitblt.
13-
DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
13+
DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
1414
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
1515

1616
INLINE = $(SRCDIR)disp68K.il

bin/makefile-sunos4.1.mc68020-multi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
1111
FPFLAGS = -f68881
1212
# DISPLAYBUFFER for Color Sparcstation code testing
1313
# NEWBITBLT for assembler version of bitblt.
14-
DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS
14+
DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM
1515
LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
1616

1717
INLINE = $(SRCDIR)disp68K.il

0 commit comments

Comments
 (0)