From 0915f5e93ba0431b527a1453502a29f44b6a5b95 Mon Sep 17 00:00:00 2001
From: Lucas Scharenbroich
Date: Sat, 30 Jul 2022 11:05:49 -0500
Subject: [PATCH 1/2] Add note about requiring newer version of merlin32
---
README.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index b3db465..33a1c5f 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,11 @@ Each demo application has a build script that also builds the toolset and copies
## Dependencies
-GTE uses the [merlin32](https://brutaldeluxe.fr/products/crossdevtools/merlin/) assembler to compile its source into GS/OS OMF files and [Cadius](https://brutaldeluxe.fr/products/crossdevtools/cadius/index.html) to copy those files onto a ProDOS disk image. The paths to these tool can be set in the `package.json` file.
+* node
+* merlin32 (1.1.10+)
+* cadius
+
+GTE uses the [merlin32](https://brutaldeluxe.fr/products/crossdevtools/merlin/) 1.1.10 assembler to compile its source into GS/OS OMF files and [Cadius](https://brutaldeluxe.fr/products/crossdevtools/cadius/index.html) to copy those files onto a ProDOS disk image. The paths to these tool can be set in the `package.json` file.
An empty 2MG disk image is included in `emu/Target.2mg` and is used as the default location for copying demo applications. This image can be mounted in any IIgs emulator.
@@ -30,7 +34,6 @@ An empty 2MG disk image is included in `emu/Target.2mg` and is used as the defau
Build of demo app in the IIgs Finder
-
# Documentation
Please refer to the GTE Toolbox documentation.
From bc5229b52848d8050c85d6a6dd4544c021a90599 Mon Sep 17 00:00:00 2001
From: Lucas Scharenbroich
Date: Sat, 30 Jul 2022 11:07:03 -0500
Subject: [PATCH 2/2] Add link to merlin32 1.1.10
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 33a1c5f..bfba6ef 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Each demo application has a build script that also builds the toolset and copies
* merlin32 (1.1.10+)
* cadius
-GTE uses the [merlin32](https://brutaldeluxe.fr/products/crossdevtools/merlin/) 1.1.10 assembler to compile its source into GS/OS OMF files and [Cadius](https://brutaldeluxe.fr/products/crossdevtools/cadius/index.html) to copy those files onto a ProDOS disk image. The paths to these tool can be set in the `package.json` file.
+GTE uses the [merlin32](https://brutaldeluxe.fr/products/crossdevtools/merlin/) [1.1.10](https://github.com/digarok/merlin32/releases/tag/v1.1.10) assembler to compile its source into GS/OS OMF files and [Cadius](https://brutaldeluxe.fr/products/crossdevtools/cadius/index.html) to copy those files onto a ProDOS disk image. The paths to these tool can be set in the `package.json` file.
An empty 2MG disk image is included in `emu/Target.2mg` and is used as the default location for copying demo applications. This image can be mounted in any IIgs emulator.