From 13c1f6166a186f741f53ac6f1984b68a8c4c4959 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Sat, 27 Jul 2019 10:49:13 -0700 Subject: [PATCH] Move macros.inc into inc/ to tidy top level dir --- desk.acc/calculator.s | 2 +- desk.acc/date.s | 2 +- desk.acc/eyes.s | 2 +- desk.acc/key.caps.s | 2 +- desk.acc/puzzle.s | 2 +- desk.acc/run.basic.here.s | 2 +- desk.acc/screen.dump.s | 2 +- desk.acc/screen.saver.s | 2 +- desk.acc/sort.directory.s | 2 +- desk.acc/this.apple.s | 2 +- desktop.system/desktop.system.s | 2 +- desktop/desktop.s | 2 +- desktop/loader.s | 2 +- docs/CodingStyle.md | 2 +- macros.inc => inc/macros.inc | 0 mgtk/mgtk.s | 2 +- preview/show.font.file.s | 2 +- preview/show.image.file.s | 2 +- preview/show.text.file.s | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) rename macros.inc => inc/macros.inc (100%) diff --git a/desk.acc/calculator.s b/desk.acc/calculator.s index 8775295..d0012bc 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/date.s b/desk.acc/date.s index 25b1a7a..2021786 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/eyes.s b/desk.acc/eyes.s index 7ef7cb2..ca6f395 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/key.caps.s b/desk.acc/key.caps.s index 64af79b..3b487c6 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/puzzle.s b/desk.acc/puzzle.s index f55e4e7..10c48c0 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/run.basic.here.s b/desk.acc/run.basic.here.s index e2a94e6..0c0cc3b 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/screen.dump.s b/desk.acc/screen.dump.s index 4acab5d..6fba534 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/screen.saver.s b/desk.acc/screen.saver.s index 66d4214..d077fd6 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/sort.directory.s b/desk.acc/sort.directory.s index eff2d8d..4002a5d 100644 --- 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" ;;; ============================================================ diff --git a/desk.acc/this.apple.s b/desk.acc/this.apple.s index 704725f..b7f434a 100644 --- 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" ;;; ============================================================ diff --git a/desktop.system/desktop.system.s b/desktop.system/desktop.system.s index 422dcb8..4021957 100644 --- 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) diff --git a/desktop/desktop.s b/desktop/desktop.s index d5ee991..a9c15c6 100644 --- 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" ;;; ============================================================ diff --git a/desktop/loader.s b/desktop/loader.s index 1b7dec6..afff972 100644 --- 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 ; ??? diff --git a/docs/CodingStyle.md b/docs/CodingStyle.md index c89f6da..7ac2d03 100644 --- 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 diff --git a/macros.inc b/inc/macros.inc similarity index 100% rename from macros.inc rename to inc/macros.inc diff --git a/mgtk/mgtk.s b/mgtk/mgtk.s index 1aa0b9e..4a0850e 100644 --- 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 diff --git a/preview/show.font.file.s b/preview/show.font.file.s index 02cbdbd..a72fbbc 100644 --- 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" diff --git a/preview/show.image.file.s b/preview/show.image.file.s index e7a73f5..8dbc2d9 100644 --- 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 diff --git a/preview/show.text.file.s b/preview/show.text.file.s index a0b1245..0de8fe6 100644 --- 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" ;;; ============================================================