Move macros.inc into inc/ to tidy top level dir

2019-07-27 10:49:13 -07:00
parent 65d57412da
commit 421cebb5ef
19 changed files with 18 additions and 18 deletions
--- a/desk.acc/calculator.s
+++ b/desk.acc/calculator.s
@@ -4,7 +4,7 @@
        .include "../inc/apple2.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/date.s
+++ b/desk.acc/date.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/eyes.s
+++ b/desk.acc/eyes.s
@@ -4,7 +4,7 @@
        .include "../inc/apple2.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"
        .include "../inc/fp_macros.inc"

 ;;; ============================================================
--- a/desk.acc/key.caps.s
+++ b/desk.acc/key.caps.s
@@ -4,7 +4,7 @@
        .include "../inc/apple2.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/puzzle.s
+++ b/desk.acc/puzzle.s
@@ -4,7 +4,7 @@
        .include "../inc/apple2.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/run.basic.here.s
+++ b/desk.acc/run.basic.here.s
@@ -13,7 +13,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/screen.dump.s
+++ b/desk.acc/screen.dump.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/screen.saver.s
+++ b/desk.acc/screen.saver.s
@@ -4,7 +4,7 @@
        .include "../inc/apple2.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"


 ;;; ============================================================
--- a/desk.acc/sort.directory.s
+++ b/desk.acc/sort.directory.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desk.acc/this.apple.s
+++ b/desk.acc/this.apple.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================

--- a/desktop.system/desktop.system.s
+++ b/desktop.system/desktop.system.s
@@ -5,7 +5,7 @@
        .include "apple2.inc"
        .include "../inc/apple2.inc"
        .include "../inc/prodos.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================
 ;;; Locations in Main LC Bank 2 (past end of custom quit routines)
--- a/desktop/desktop.s
+++ b/desktop/desktop.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"


 ;;; ============================================================
--- a/desktop/loader.s
+++ b/desktop/loader.s
@@ -3,7 +3,7 @@
        .include "apple2.inc"
        .include "../inc/apple2.inc"
        .include "../inc/prodos.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 DESKTOP_INIT    := $0800        ; init location
 L7ECA           := $7ECA        ; ???
--- a/docs/CodingStyle.md
+++ b/docs/CodingStyle.md
@@ -131,7 +131,7 @@ start:  lda     ptr

 * Macro use is **encouraged**.
 * Use local macros to avoid repeating code.
-* Use `macros.inc` and extend as needed to capture patterns such as
+* Use `inc/macros.inc` and extend as needed to capture patterns such as
   16-bit operations
 * API calls such as ProDOS MLI calls should be done with macros

--- a/inc/macros.inc
+++ b/inc/macros.inc
--- a/mgtk/mgtk.s
+++ b/mgtk/mgtk.s
@@ -4,7 +4,7 @@
        .include "../inc/apple2.inc"
        .include "../inc/prodos.inc"
        .include "mgtk.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================
 ;;; MouseGraphics ToolKit
--- a/preview/show.font.file.s
+++ b/preview/show.font.file.s
@@ -2,7 +2,7 @@
        .setcpu "6502"

        .include "apple2.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"
        .include "../inc/apple2.inc"
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
--- a/preview/show.image.file.s
+++ b/preview/show.image.file.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================
 ;;; Memory map
--- a/preview/show.text.file.s
+++ b/preview/show.text.file.s
@@ -5,7 +5,7 @@
        .include "../inc/prodos.inc"
        .include "../mgtk/mgtk.inc"
        .include "../desktop.inc"
-        .include "../macros.inc"
+        .include "../inc/macros.inc"

 ;;; ============================================================