From bc390c511fb9b911a3dd8b13e653cefdb9338147 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 8 Sep 2022 12:44:19 -0700 Subject: [PATCH] Scratch branch for (trying to) build old release 2.01 --- bin/makefile-darwin.x86_64-x | 2 +- bin/makefile-init-darwin.x86_64 | 2 +- src/mvs.c | 4 ++-- src/rplcons.c | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index e17f10b..c8f19f3 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=201 # was 351 LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/bin/makefile-init-darwin.x86_64 b/bin/makefile-init-darwin.x86_64 index 322b4a8..ee0ad77 100644 --- a/bin/makefile-init-darwin.x86_64 +++ b/bin/makefile-init-darwin.x86_64 @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O0 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=201 -DNOVERSION -DINIT LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/src/mvs.c b/src/mvs.c index ad34b64..0e84bcc 100644 --- a/src/mvs.c +++ b/src/mvs.c @@ -19,8 +19,8 @@ /************************************************************************/ #include "adr68k.h" // for NativeAligned4FromLAddr -#ifdef RESWAPPEDCODESTREAM -#include "byteswapdefs.h" // for byte_swap_code_block +#if defined(RESWAPPEDCODESTREAM) | !defined(BIGVM) +#include "byteswapdefs.h" // for byte_swap_code_block, swapx #endif #include "car-cdrdefs.h" // for car #include "conspagedefs.h" // for cons diff --git a/src/rplcons.c b/src/rplcons.c index 7d72ae5..cef2185 100644 --- a/src/rplcons.c +++ b/src/rplcons.c @@ -22,6 +22,10 @@ */ /**********************************************************************/ +#if !defined(NEWCDRCODING) +#include "address.h" +#include "gcdata.h" +#endif #include "car-cdrdefs.h" // for N_OP_rplacd #include "conspagedefs.h" // for cons #include "emlglob.h"