nanogui: Small fixes to make system of pre4
Subject:
Small fixes to make system of pre4
From:
Morten Rolland ####@####.####
Date:
21 Jan 2000 10:45:48 -0000
Message-Id: <388843DE.B15D3F52@screenmedia.no>
Hi,
As announced, there was a couple of problems for me with the
new build system in pre4. The GdArea/GrArea functions are
dependent on a consistent and correct PIXELVAL datatype, which is
conditionally declared depending on the SCREEN_PIXTYPE compile
time option. The following patch fixes this and another small
glitch with SCREEN_E15.
Please note that nano-X clients are not dependent on the
SCREEN_PIXTYPE the same way as the nano-X server and drivers
are during compilation (If they specify the correct
PF_TRUECOLOR* or PF_PALETTE pixelformat to GrArea - the
nano-X server has to support the pixel format used, though).
Regards,
Morten Rolland
PS: Patch as MIME attachement as well.
--- microwin-0.87pre4-orig/src/Makefile.rules Wed Jan 19 06:35:26 2000
+++ microwin-0.87pre4-fix/src/Makefile.rules Fri Jan 21 09:44:42 2000
@@ -27,9 +27,9 @@
ifeq ($(HAVE_JPEG_SUPPORT), Y)
LDFLAGS += -ljpeg
endif
-CFLAGS += $(INCLUDEDIRS)
+CFLAGS += $(INCLUDEDIRS) -DSCREEN_PIXTYPE=$(SCREEN_PIXTYPE)
HOSTCFLAGS := $(CFLAGS)
CPPFLAGS += $(DEFINES)
LDFLAGS += -L$(TOP)/lib
OPTFLAGS += -O3
--- microwin-0.87pre4-orig/src/config Wed Jan 19 06:39:10 2000
+++ microwin-0.87pre4-fix/src/config Fri Jan 21 09:46:56 2000
@@ -35,8 +35,14 @@
NANOXDEMO = Y
NWIDGETDEMO = Y
TEST = N
+# The pixeltype of the native hardware/underlying gfx library (X11).
+# This definition helps define the PIXELVAL to be of 16 or 8 bit size
+# when no more bits are needed. It also enables GdArea/GrArea for this
+# particular pixel packing format.
+SCREEN_PIXTYPE = PF_TRUECOLOR565
# NanoX: uncomment the following line to link the nano-X application
# with the server. This is required for ELKS, if no network is present,
# or for speed or debugging. This affects the nano-X server only.
LINK_APP_INTO_SERVER = N
@@ -79,9 +85,8 @@
SCREEN_E15 = N
SCREEN_WIDTH = 640
SCREEN_HEIGHT = 480
SCREEN_DEPTH = 16
-SCREEN_PIXTYPE = PF_TRUECOLOR565
# If 4bpp driver with arm SA1100 LCD controller is used ...
SA1100_LCD_LTLEND = N
--- microwin-0.87pre4-orig/src/config.x11 Wed Jan 19 06:25:20 2000
+++ microwin-0.87pre4-fix/src/config.x11 Fri Jan 21 09:47:59 2000
@@ -34,8 +34,14 @@
NANOXDEMO = Y
NWIDGETDEMO = Y
TEST = N
+# The pixeltype of the native hardware/underlying gfx library (X11).
+# This definition helps define the PIXELVAL to be of 16 or 8 bit size
+# when no more bits are needed. It also enables GdArea/GrArea for this
+# particular pixel packing format.
+SCREEN_PIXTYPE = PF_TRUECOLOR565
# NanoX: uncomment the following line to link the nano-X application
# with the server. This is required for ELKS, if no network is present,
# or for speed or debugging. This affects the nano-X server only.
LINK_APP_INTO_SERVER = N
--- microwin-0.87pre4-orig/src/drivers/Makefile Wed Jan 19 06:20:21 2000
+++ microwin-0.87pre4-fix/src/drivers/Makefile Thu Jan 20 09:29:39 2000
@@ -38,9 +38,9 @@
ifeq ($(X11), Y)
OBJS += scr_x11.o
endif
-ifdef SCREEN_E15
+ifeq ($(SCREEN_E15), Y)
CFLAGS += -DSCREEN_E15=1
endif
ifdef SCREEN_HEIGHT
[Content type application/octet-stream not shown. Download]