Move MGTK to mgtk/ dir to tidy up top level

APIs.md

@@ -20,7 +20,7 @@ This is a complex API library written by Apple circa 1985. It consists of:
 
 Entry point is fixed at $4000 AUX, called MLI-style (JSR followed by command type and address of param block).
 
-See [MGTK.md](MGTK.md) for further documentation.
+See [MGTK.md](mgtk/MGTK.md) for further documentation.
 
 <!-- ============================================================ -->
 

desk.acc/calculator.s

@@ -2,7 +2,7 @@
 
         .include "apple2.inc"
         .include "../inc/apple2.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/date.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/eyes.s

@@ -2,7 +2,7 @@
 
         .include "apple2.inc"
         .include "../inc/apple2.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
         .include "../inc/fp_macros.inc"

desk.acc/key.caps.s

@@ -2,7 +2,7 @@
 
         .include "apple2.inc"
         .include "../inc/apple2.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/puzzle.s

@@ -2,7 +2,7 @@
 
         .include "apple2.inc"
         .include "../inc/apple2.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/run.basic.here.s

@@ -11,7 +11,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/screen.dump.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/screen.saver.s

@@ -2,7 +2,7 @@
 
         .include "apple2.inc"
         .include "../inc/apple2.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/sort.directory.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desk.acc/this.apple.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

desktop/Makefile

@@ -5,7 +5,7 @@ CCFLAGS = --config asm.cfg
 
 OUTDIR = out
 
-HEADERS = $(wildcard ../*.inc) $(wildcard ../inc/*.inc) $(wildcard *.inc)
+HEADERS = $(wildcard ../*.inc) $(wildcard ../inc/*.inc) $(wildcard ../mgtk/*.inc) $(wildcard *.inc)
 
 SEGMENTS = loader mgtk desktop
 
@@ -23,6 +23,9 @@ clean:
 	rm -f $(OUTDIR)/*.built
 	rm -f $(TARGETS)
 
+$(OUTDIR)/mgtk.o: ../mgtk/mgtk.s $(HEADERS)
+	$(CC65)/ca65 $(CAFLAGS) --listing $(basename $@).list -o $@ $<
+
 $(OUTDIR)/desktop.o: desktop.s $(HEADERS) desktop_* ovl*.s
 	$(CC65)/ca65 $(CAFLAGS) --listing $(basename $@).list -o $@ $<
 

desktop/README.md

@@ -79,7 +79,7 @@ run.
 
 `mgtk.s`
 
-Aux $4000-$8580 is the [MouseGraphics ToolKit](../MGTK.md) - a
+Aux $4000-$8580 is the [MouseGraphics ToolKit](../mgtk/MGTK.md) - a
 GUI library used for the DeskTop application.
 
 Since this resides in Aux memory, DeskTop spends most of its time

desktop/desktop.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

mgtk/README.md

@@ -0,0 +1,7 @@
+# MouseGraphics ToolKit
+
+* `mgtk.inc` - header file to include
+
+* `mgtk.s` - toolkit source - build as part of application
+
+* `MGTK.md` - ToolKit documentation

mgtk/mgtk.s

@@ -3,8 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "mgtk.inc"
-        .include "../desktop.inc"
         .include "../macros.inc"
 
 ;;; ============================================================

preview/show.font.file.s

@@ -5,7 +5,7 @@
         .include "../macros.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
 
 ;;; ============================================================

preview/show.image.file.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"
 

preview/show.text.file.s

@@ -3,7 +3,7 @@
         .include "apple2.inc"
         .include "../inc/apple2.inc"
         .include "../inc/prodos.inc"
-        .include "../mgtk.inc"
+        .include "../mgtk/mgtk.inc"
         .include "../desktop.inc"
         .include "../macros.inc"