github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-13 23:27:12 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -29,7 +29,6 @@ SET(MAIKO_DEFINITIONS
IF(TRUE)
# Turn this into a config option.
LIST(APPEND MAIKO_DEFINITIONS
"-DNOPIXRECT"
"-DXWINDOW"
)
ENDIF()

2
bin/makefile-cygwin.x86_64-x
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

2
bin/makefile-darwin.386-x
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

2
bin/makefile-darwin.aarch64-x
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

2
bin/makefile-darwin.x86_64-x
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

2
bin/makefile-freebsd.386-x
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

2
bin/makefile-init.386
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

2
bin/makefile-init.sparc
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

2
bin/makefile-linux.386-x
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

2
bin/makefile-linux.armv7l-x
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

2
bin/makefile-linux.x86_64-x
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

2
bin/makefile-openbsd.x86_64-x
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

4
bin/makefile-sunos5.386-x
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

2
bin/makefile-sunos5.i386-x
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

3
bin/makefile-sunos5.sparc-x
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) \

4
bin/makefile-sunos5.x86_64-x
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