1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-25 19:46:21 +00:00

Don't enable NOPIXRECT when XWINDOW is defined. (#287)

This used to be required, but has been fixed now.
This commit is contained in:
Bruce Mitchener
2021-01-25 09:20:13 +07:00
committed by GitHub
parent 04b4b64b87
commit d4cbb6c9dc
16 changed files with 17 additions and 19 deletions

View File

@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -DXWINDOW -DNOPIXRECT
XFLAGS = -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o

View File

@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2.
OPTFLAGS = -O2 -g

View File

@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -I/opt/local/include -DXWINDOW -DNOPIXRECT
XFLAGS = -I/opt/local/include -DXWINDOW
# OPTFLAGS is normally -O2.
OPTFLAGS = -O1 -g

View File

@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2.
OPTFLAGS = -O1 -g

View File

@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT
XFLAGS = -I/usr/local/include -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o

View File

@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
XFLAGS = -I/opt/X11/include -DXWINDOW
# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
OPTFLAGS = -O0 -g

View File

@@ -45,7 +45,7 @@ OPTFLAGS = -g3 -O
DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI -DNOPIXRECT \
MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI \
-I$(OPENWINHOME)/include \
-DLOGINT -DLOCK_X_UPDATES

View File

@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -DXWINDOW -DNOPIXRECT
XFLAGS = -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o

View File

@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xrdopt.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -DXWINDOW -DNOPIXRECT
XFLAGS = -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o

View File

@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -DXWINDOW -DNOPIXRECT
XFLAGS = -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o

View File

@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -I/usr/X11R6/include -DXWINDOW -DNOPIXRECT
XFLAGS = -I/usr/X11R6/include -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o

View File

@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xrdopt.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -DXWINDOW -DNOPIXRECT
XFLAGS = -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o
@@ -38,7 +38,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \
-DOS5 -DBYTESWAP -DLOGINT \
-DNOPIXRECT -DLOCK_X_UPDATES \
-DLOCK_X_UPDATES \
-DRELEASE=351
LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl

View File

@@ -39,7 +39,7 @@ DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \
-DOS5 -DAIX -DUSE_DLPI \
-DBYTESWAP -DLOGINT \
-DNOPIXRECT -DLOCK_X_UPDATES \
-DLOCK_X_UPDATES \
-I$(OPENWINHOME)/include \
-DRELEASE=210

View File

@@ -42,8 +42,7 @@ OPTFLAGS = -O2 -g3
DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
MACHINEFLAGS = -DOS5 -DUSE_DLPI -DNOPIXRECT \
-DLOGINT -DLOCK_X_UPDATES
MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOGINT -DLOCK_X_UPDATES
DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \

View File

@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xrdopt.o \
$(OBJECTDIR)xwinman.o
XFLAGS = -DXWINDOW -DNOPIXRECT
XFLAGS = -DXWINDOW
# This is to make the %$#@! Apollo cc happy
OEXT = .o
@@ -38,7 +38,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \
-DOS5 -DBYTESWAP -DLOGINT \
-DNOPIXRECT -DLOCK_X_UPDATES \
-DLOCK_X_UPDATES \
-DUSE_DLPI \
-DRELEASE=351