Merge branch 'master' of https://github.com/Zeda/Grammer2

Readme.md

@@ -21,6 +21,6 @@ Windows, @NonstickAtom785 has built the fixed version and posted it [here](https
 From the command line, run `./compile`
 
 ## Windows:
-Download Windows [`spasm-ng`](https://github.com/alberthdev/spasm-ng/releases) release, rename it to `spasm.exe` and place it in the project directory. From command prompt or powershell cd to the project directory and run `compile.bat`.
+Download the Windows [`spasm-ng`](https://github.com/alberthdev/spasm-ng/releases) release, rename it to `spasm.exe` and place it in the project directory. From command prompt do `compile` (or if you prefer powershell... do `./compile`). Read the above note if you are getting errors.
 
 This generates the jump table and compiles the app and Grammer package.

compile.bat

@@ -1,28 +1,37 @@
 @echo off
+
+
 if exist spasm.exe (
   echo "Starting Compile..."
 ) else (
   echo "Opening readme..."
   start "" https://github.com/Zeda/Grammer2/blob/master/Readme.md
   exit
-)
+         )
 
 cd src
 
-echo "Generating grammer2.5.inc"
-python ..\tools\jt.py jmptable.z80 grammer2.5.inc
-copy /Y grammer2.5.inc ..\docs\grammer2.5.inc
+rem Generates the jumptable and grammer2.5.inc file together.
+  echo "Generating grammer2.5.inc"
+  python ..\tools\jt.py jmptable.z80 grammer2.5.inc
+  copy /Y grammer2.5.inc ..\docs\grammer2.5.inc
+
+    echo "Assembling App"
+    ..\spasm.exe grammer.z80 ..\bin\grammer.8xk -I ..\z80float\single
 
-echo "Assembling Default Package"
-..\spasm.exe grampkg.z80 ..\bin\grampkg.8xv
+rem If the second command line argument is -ca then compile everything else.
+if "%1"=="a" (
+    echo "Assembling Default Package"
+    ..\spasm.exe grampkg.z80 ..\bin\grampkg.8xv
 
-echo "Assembling App"
-..\spasm.exe grammer.z80 ..\bin\grammer.8xk -I ..\z80float\single
+rem Install experimental package
+     	echo "Assembling Experimental Package"
+   	..\spasm.exe experimental\experimental.z80 ..\bin\EXPRMNTL.8xv -I single
 
-rem Check for an experimental package
-if exist experimental\experimental.z80 (
-  echo "Assembling Experimental Package"
-  ..\spasm.exe experimental\experimental.z80 ..\bin\EXPRMNTL.8xv -I single
+rem Install program launcher
+    echo "Assembling Program Launcher"
+    ..\spasm.exe launch.z80 ..\bin\g250.8xp
+    
 )
 
 cd..