Restructured the codebase for a bit more clarity

part12-wgt/Makefile

@@ -1,4 +1,4 @@
-CFILES = $(wildcard *.c lib/*.c)
+CFILES = $(wildcard *.c lib/*.c wgt/*.c)
 OFILES = $(CFILES:.c=.o)
 LLVMPATH = /opt/homebrew/opt/llvm/bin
 CLANGFLAGS = -Wall -O2 -ffreestanding -nostdinc -nostdlib -mcpu=cortex-a72+nosimd
@@ -43,4 +43,4 @@ kernel8.img: boot/boot.o $(OFILES) bin/BCM4345C0.o bin/wgt1pal.o bin/wgt1blk.o b
 	$(LLVMPATH)/llvm-objcopy -O binary kernel8.elf kernel8.img
 
 clean:
-	/bin/rm kernel8.elf *.o bin/*.o boot/*.o lib/*.o *.img > /dev/null 2> /dev/null || true
+	/bin/rm kernel8.elf *.o bin/*.o boot/*.o lib/*.o wgt/*.o *.img > /dev/null 2> /dev/null || true

part12-wgt/include/wgt.h

@@ -1,4 +1,4 @@
-#include "include/mb.h"
+#include "mb.h"
 
 #define NULL 0
 #define rgb(r,g,b) (r<<16)|(g<<8)|b

part12-wgt/samples/wgt01.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 // ######## WGT EXAMPLES ########
 

part12-wgt/samples/wgt02.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 // ######## REQUIRED FUNCTIONS ########
 

part12-wgt/samples/wgt03.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mb.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt04.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 #define MAX_RADIUS 100
 

part12-wgt/samples/wgt07.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 
 // ######## REQUIRED FUNCTIONS ########
 

part12-wgt/samples/wgt08.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt09.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/mb.h"
 

part12-wgt/samples/wgt10.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/mb.h"
 

part12-wgt/samples/wgt11.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/mb.h"
 

part12-wgt/samples/wgt17.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt18.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 

part12-wgt/samples/wgt19.c

@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 

part12-wgt/samples/wgt20.c

@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 

part12-wgt/samples/wgt21.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt22.c

@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 

part12-wgt/samples/wgt24.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt25.c

@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt27.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt29.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt32.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt33.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt45.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt46.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "include/wgt.h"
 #include "include/mem.h"
 
 // ######## REQUIRED FUNCTIONS ########

part12-wgt/samples/wgt60.c

@@ -1,4 +1,4 @@
-#include "wgtspr.h"
+#include "include/wgtspr.h"
 #include "include/mem.h"
 #include "include/multicore.h"
 

part12-wgt/wgt/fill.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 static short start, end;            /* Start and end x coords for filled line */
 

part12-wgt/wgt/loadspr.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 short wloadsprites (color *pal, unsigned char *file, block *image_array, short start,
 		    short end)

part12-wgt/wgt/mouse.c

@@ -1,7 +1,7 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/multicore.h"
+#include "../include/multicore.h"
-#include "include/io.h"
+#include "../include/io.h"
-#include "include/bt.h"
+#include "../include/bt.h"
 
 #define MAX_MSG_LEN    50
 #define MAX_READ_RUN   100

part12-wgt/wgt/nline.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wfline (short x, short y, short x2, short y2)
 {

part12-wgt/wgt/wbezier.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 void wbezier (tpolypoint *rawpts, short numraw, tpolypoint *curvepts, short numcurve)
 /* Bezier curve algorithm submitted to us by Claude Morais */

part12-wgt/wgt/wblock.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 block wloadblock (unsigned char *data)
 {

part12-wgt/wgt/wbox.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wrectangle (short x, short y, short x2, short y2)
 {

part12-wgt/wgt/wbutt.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wbutt (short x, short y, short x2, short y2)
 {

part12-wgt/wgt/wcircle.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 static void hplotcircle (short x, short y, short x_center, short y_center)
 {

part12-wgt/wgt/wclip.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wclip (short x, short y, short x2, short y2)
 {

part12-wgt/wgt/wdissolve.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wdissolve (block sourceimage, short *pattern, short speed)
 {

part12-wgt/wgt/wellipse.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wellipse (short x_center, short y_center, short x_radius, short y_radius)
 {

part12-wgt/wgt/wflipb.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 #define fastcopy memcpy
 

part12-wgt/wgt/wgt.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 block abuf;                              /* pointer to the active screen */
 block fbuf;                              /* pointer to the hardware framebuffer */

part12-wgt/wgt/winitply.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 short *pinit_array;
 short *pstartx;

part12-wgt/wgt/wline.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wline (short x, short y, short x2, short y2)
 {

part12-wgt/wgt/wmiscb.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 extern short bx,by,tx,ty;
 

part12-wgt/wgt/wnpblock.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/mem.h"
+#include "../include/mem.h"
 
 // We should replace this with faster version (and xray needs to do the right thing - not sure memcpy is a good replacement)
 #define fastcopy memcpy

part12-wgt/wgt/wpal.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wloadpalette (unsigned char *data, color *pal)
 {

part12-wgt/wgt/wpixel.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 unsigned int wgetpixel (short x, short y)
 {

part12-wgt/wgt/wresize.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void resize_horizontal_line (block src, block dest, unsigned int whole,
 	   unsigned int xfrac, unsigned short step, short length)

part12-wgt/wgt/wscreen.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 #define fastcopy memcpy
 

part12-wgt/wgt/wsetcol.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wsetcolor (unsigned int col)
 {

part12-wgt/wgt/wsetmode.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void vga256(void)
 {

part12-wgt/wgt/wskew.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 #define fastcopy memcpy
 

part12-wgt/wgt/wspoly.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 extern short *pinit_array;
 extern short *pstartx;

part12-wgt/wgt/wspr.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 /* The following defines should be altered to suit your program needs */
 #define MAX_SPRITES        100

part12-wgt/wgt/wtext.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 short xc, yc, cstart, cend, curspeed;
 short grid, trans;

part12-wgt/wgt/wticker.c

@@ -1,5 +1,5 @@
-#include "wgt.h"
+#include "../include/wgt.h"
-#include "include/multicore.h"
+#include "../include/multicore.h"
 
 short ticker_speed, ticker_running;
 unsigned int ticker_interval;

part12-wgt/wgt/wvertres.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 #define fastcopy memcpy
 

part12-wgt/wgt/wwarp.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wsline (short x, short y, short x2, short y2, short *y_array)
 {

part12-wgt/wgt/wwipe.c

@@ -1,4 +1,4 @@
-#include "wgt.h"
+#include "../include/wgt.h"
 
 void wwipe (short x, short y, short x2, short y2, block image)
 {