From 2e9776edf2d2822bcfda23734ac4b7511869ebd1 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 25 Jan 2021 08:53:06 +0700 Subject: [PATCH] Remove OLD_CURSOR from our builds. (#284) This is no longer used under X11, which all of our builds are using. Closes Interlisp/medley#84. --- CMakeLists.txt | 1 - 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-freebsd.386-x | 3 +-- bin/makefile-init.386 | 3 +-- bin/makefile-init.sparc | 2 +- bin/makefile-linux.386-x | 2 +- bin/makefile-linux.armv7l-x | 2 +- bin/makefile-linux.x86_64-x | 2 +- bin/makefile-openbsd.x86_64-x | 2 +- bin/makefile-sunos5.386-x | 2 +- bin/makefile-sunos5.i386-x | 11 +++++------ bin/makefile-sunos5.sparc-x | 2 +- bin/makefile-sunos5.x86_64-x | 2 +- 16 files changed, 19 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d6766b..7e575a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,6 @@ ENDIF() IF(UNIX) LIST(APPEND MAIKO_DEFINITIONS "-DLOGINT" - "-DOLD_CURSOR" ) ENDIF() diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x index 154763e..de376c2 100644 --- a/bin/makefile-cygwin.x86_64-x +++ b/bin/makefile-cygwin.x86_64-x @@ -20,7 +20,7 @@ XFLAGS = -DXWINDOW -DNOPIXRECT OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = -DAIX -DOLD_CURSOR \ +DFLAGS = -DAIX \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index f0b4aa3..3dcee81 100644 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -19,7 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) -DOLD_CURSOR \ +DFLAGS = $(DEBUGFLAGS) \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index ccd5d8b..5d4e936 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -19,7 +19,7 @@ XFLAGS = -I/opt/local/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) -DOLD_CURSOR \ +DFLAGS = $(DEBUGFLAGS) \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index cadae3c..429eede 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -19,7 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) -DOLD_CURSOR \ +DFLAGS = $(DEBUGFLAGS) \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index 3219bc9..ec340b0 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -19,8 +19,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -gdwarf-2 -DFLAGS = -DOLD_CURSOR \ - -DBYTESWAP -DLOGINT $(XFLAGS) \ +DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm -lcrypt diff --git a/bin/makefile-init.386 b/bin/makefile-init.386 index ceb18aa..04b1098 100644 --- a/bin/makefile-init.386 +++ b/bin/makefile-init.386 @@ -18,8 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it OPTFLAGS = -O0 -g -DFLAGS = -DOLD_CURSOR \ - -DBYTESWAP -DLOGINT $(XFLAGS) \ +DFLAGS = -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE LDFLAGS = -L/usr/X11/lib -lX11 -lm diff --git a/bin/makefile-init.sparc b/bin/makefile-init.sparc index a9d6ba8..773968f 100644 --- a/bin/makefile-init.sparc +++ b/bin/makefile-init.sparc @@ -47,7 +47,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI -DNOPIXRECT \ -I$(OPENWINHOME)/include \ - -DOLD_CURSOR -DLOGINT -DLOCK_X_UPDATES + -DLOGINT -DLOCK_X_UPDATES # The LDEINIT wants to have NOVERSION set, so we don't hang up on # any change-over in versions. diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x index 3fb4e78..98e5c0b 100644 --- a/bin/makefile-linux.386-x +++ b/bin/makefile-linux.386-x @@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW -DNOPIXRECT OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = -DAIX -DOLD_CURSOR \ +DFLAGS = -DAIX \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index 219ee9f..9864584 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW -DNOPIXRECT OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = -DAIX -DOLD_CURSOR \ +DFLAGS = -DAIX \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x index 154763e..de376c2 100644 --- a/bin/makefile-linux.x86_64-x +++ b/bin/makefile-linux.x86_64-x @@ -20,7 +20,7 @@ XFLAGS = -DXWINDOW -DNOPIXRECT OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = -DAIX -DOLD_CURSOR \ +DFLAGS = -DAIX \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x index c9e36b9..758d8bf 100644 --- a/bin/makefile-openbsd.x86_64-x +++ b/bin/makefile-openbsd.x86_64-x @@ -19,7 +19,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW -DNOPIXRECT OEXT = .o # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = -DAIX -DOLD_CURSOR \ +DFLAGS = -DAIX \ -DBYTESWAP -DLOGINT $(XFLAGS) \ -DRELEASE=351 diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x index 74aad4a..8afecb6 100644 --- a/bin/makefile-sunos5.386-x +++ b/bin/makefile-sunos5.386-x @@ -37,7 +37,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ - -DOS5 -DBYTESWAP -DOLD_CURSOR -DLOGINT \ + -DOS5 -DBYTESWAP -DLOGINT \ -DNOPIXRECT -DLOCK_X_UPDATES \ -DRELEASE=351 diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x index 79990ba..4b93c09 100644 --- a/bin/makefile-sunos5.i386-x +++ b/bin/makefile-sunos5.i386-x @@ -36,13 +36,12 @@ OPTFLAGS = -O2 -g3 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK DFLAGS = $(XFLAGS) \ - $(DEBUGFLAGS) \ + $(DEBUGFLAGS) \ -DOS5 -DAIX -DUSE_DLPI \ - -DBYTESWAP \ - -DOLD_CURSOR -DLOGINT \ - -DNOPIXRECT -DLOCK_X_UPDATES \ - -I$(OPENWINHOME)/include \ - -DRELEASE=210 + -DBYTESWAP -DLOGINT \ + -DNOPIXRECT -DLOCK_X_UPDATES \ + -I$(OPENWINHOME)/include \ + -DRELEASE=210 LDFLAGS = -R$(OPENWINHOME)/lib -L$(OPENWINHOME)/lib -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -R$(OPENWINHOME)/lib -L$(OPENWINHOME)/lib -lX11 -lc -lm -lsocket -lnsl diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x index a3c404b..3357779 100644 --- a/bin/makefile-sunos5.sparc-x +++ b/bin/makefile-sunos5.sparc-x @@ -43,7 +43,7 @@ OPTFLAGS = -O2 -g3 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK MACHINEFLAGS = -DOS5 -DUSE_DLPI -DNOPIXRECT \ - -DOLD_CURSOR -DLOGINT -DLOCK_X_UPDATES + -DLOGINT -DLOCK_X_UPDATES DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x index deb2afe..f1c8e54 100644 --- a/bin/makefile-sunos5.x86_64-x +++ b/bin/makefile-sunos5.x86_64-x @@ -37,7 +37,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ - -DOS5 -DBYTESWAP -DOLD_CURSOR -DLOGINT \ + -DOS5 -DBYTESWAP -DLOGINT \ -DNOPIXRECT -DLOCK_X_UPDATES \ -DUSE_DLPI \ -DRELEASE=351