Added code to allow mkrelease to pick up a version number from the version file. If built without the flag then main generates a build timestamp.

4 files changed, 23 insertions, 12 deletions

diff --git a/instructions.txt b/instructions.txt
index e06b48a..730f513 100644
--- a/instructions.txt
+++ b/instructions.txt
@@ -158,6 +158,9 @@
 
         http://chishm.drunkencoders.com/DLDI/index.html
 
+    Note that the default driver linked in is the Datel Max Media Dock
+    (Compact Flash) -- solely as that's what I have.
+
     Simply place the .P file (ZX81 games are usually distributed as .P files
     that are simply an image of the memory that would have been dumped to tape)
     and either put it in the root directory of the FAT device or in a directory
@@ -166,8 +169,8 @@
     Alternatively if you can't remember the names of files, loading "*" will
     give you with a file selector to select the tape file with.
 
-    Note it can't be at all guaranteed that all original ZX81 games will work
-    as expected.  After all, DS81 isn't really a ZX81.
+    It can't be at all guaranteed that all original ZX81 games will work as
+    expected.  After all, DS81 isn't really a ZX81.
 
 
 6. High Resolution Support
@@ -179,7 +182,7 @@
     high and low-resolution in the same frame.
 
     I know the Software Farms games seem to work, though "Forty Niner"
-    sometimes goes mad (just incrementing the score ) though that's probably
+    sometimes goes mad (just incrementing the score) though that's probably
     a general emulation bug.  Of course unless it did that anyway -- I've never
     played it before.
     
@@ -190,7 +193,7 @@
 
     If you know of a game that seems to cause it real trouble, please let me
     know -- the high-resolution support is still a bit of a hack whereby the
-    emulator searches memory for the display file on detecting that the I
+    'emulator searches memory for the display file on detecting that the 'I'
     register has changed.
 
 
@@ -213,16 +216,16 @@
 
     X           - Display a help page.
 
-    SELECT      - Toggles between the disassembly/register display and a
-                  display of memory.
+    SELECT      - Toggles between the current disassembly/CPU state display,
+                  a disassembly or a hex-dump of memory.
 
     L/R         - The shoulder buttons change the address being displayed on
                   the memory dump.  Hold the Y key at the same time to make
                   it jump in bigger steps.
 
-    B           - Cycles the value used for the memory dump -- either the
-                  address as set with the shoulder buttons, or one of the
-                  registers: HL, IX, SP, IY, BC or DE.
+    B           - Cycles the value used for the memory dump or assembly views;
+                  either the address as set with the shoulder buttons, or one
+                  of the registers: HL, IX, SP, IY, BC, DE or PC.
 
     Press the config bar at the bottom of the soft keyboard to exit the
     machine code monitor and return to normal running.
diff --git a/mkrelease.sh b/mkrelease.sh
index 4002f4b..2de72d1 100644
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -2,13 +2,15 @@
 
 rm -f *.nds *.elf *.gba *.arm9
 
+version=`cat version`
+
 make clean
-make ADDITIONAL_CFLAGS="-DDS81_DISABLE_FAT"
+make ADDITIONAL_CFLAGS="-DDS81_DISABLE_FAT -DDS81_VERSION=\"\\\"$version\\\"\""
 
 mv ds81.nds ds81-nofat.nds
 mv ds81.ds.gba ds81-nofat.ds.gba
 
 make clean
-make
+make ADDITIONAL_CFLAGS="-DDS81_VERSION=\"\\\"$version\\\"\""
 
 ./fat_patch.sh
diff --git a/source/main.c b/source/main.c
index 5193967..70ce02e 100644
--- a/source/main.c
+++ b/source/main.c
@@ -39,6 +39,11 @@
 #include "splashimg_bin.h"
 #include "rom_font_bin.h"
 
+#ifndef DS81_VERSION
+#define DS81_VERSION "DEVEL " __TIME__ "/" __DATE__
+#endif
+
+
 /* ---------------------------------------- STATIC DATA
 */
 static const char *main_menu[]=
@@ -85,6 +90,7 @@ static void Splash(void)
     static const char *text[]=
     {
     	"DS81 \177 2006 Ian C",
+	DS81_VERSION,
 	" ",
 	"ZX81 ROM \177 1981",
 	"Nine Tiles Networks LTD",
@@ -95,7 +101,6 @@ static void Splash(void)
 	" ",
 	" ",
 	" ",
-	" ",
 	"Checking for FAT device...",
 	NULL
     };
diff --git a/version b/version
new file mode 100644
index 0000000..6f58db0
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+V1.2 Development