From 018d320ba291dcee8333a2a613daddf766f7732f Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sun, 12 Oct 2008 03:33:45 +0000
Subject: [PATCH] makefile cleanup

---
 make.sh   | 53 ++++++++---------------------------------------------
 msbasic.s | 20 ++++++++++++++------
 2 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/make.sh b/make.sh
index f391450..8722365 100755
--- a/make.sh
+++ b/make.sh
@@ -1,50 +1,13 @@
 # 1.0
-echo cbmbasic1
-ca65 -D CBM1 msbasic.s -o tmp/cbmbasic1.o &&
-ld65 -C cbmbasic1.cfg tmp/cbmbasic1.o -o tmp/cbmbasic1-new.bin && 
-xxd -g 1 orig/cbmbasic1.bin > tmp/cbmbasic1.bin.txt
-xxd -g 1 tmp/cbmbasic1-new.bin > tmp/cbmbasic1-new.bin.txt
-diff -u tmp/cbmbasic1.bin.txt tmp/cbmbasic1-new.bin.txt | head
+for i in cbmbasic1 cbmbasic2 kbdbasic osi kb9 applesoft; do
 
-# 1.0 ?
-#echo kbdbasic
-#ca65 -D KBD msbasic.s -o tmp/kbdbasic.o &&
-#ld65 -C kbdbasic.cfg tmp/kbdbasic.o -o tmp/kbdbasic-new.bin && 
-#xxd -g 1 orig/kbdbasic.bin > tmp/kbdbasic.bin.txt
-#xxd -g 1 tmp/kbdbasic-new.bin > tmp/kbdbasic-new.bin.txt
-#diff -u tmp/kbdbasic.bin.txt tmp/kbdbasic-new.bin.txt | head
+echo $i
+ca65 -D $i msbasic.s -o tmp/$i.o &&
+ld65 -C $i.cfg tmp/$i.o -o tmp/$i-new.bin -Ln tmp/$i.lbl && 
+xxd -g 1 orig/$i.bin > tmp/$i.bin.txt
+xxd -g 1 tmp/$i-new.bin > tmp/$i-new.bin.txt
+diff -u tmp/$i.bin.txt tmp/$i-new.bin.txt | head
 
-# 1.0 rev 3.2
-#echo osi
-#ca65 -D OSI msbasic.s -o tmp/osi.o &&
-#ld65 -C osi.cfg tmp/osi.o -o tmp/osi-new.bin
-#xxd -g 1 orig/osi.bin > tmp/osi.bin.txt
-#xxd -g 1 tmp/osi-new.bin > tmp/osi-new.bin.txt
-#diff -u tmp/osi.bin.txt tmp/osi-new.bin.txt | head
+done
 
-# 1.1
-#echo kb9
-#ca65 -D KIM msbasic.s -o tmp/kb9.o &&
-#ld65 -C kb9.cfg tmp/kb9.o -o tmp/kb9-new.bin &&
-#xxd -g 1 orig/kb9.bin > tmp/kb9.bin.txt
-#xxd -g 1 tmp/kb9-new.bin > tmp/kb9-new.bin.txt
-#diff -u tmp/kb9.bin.txt tmp/kb9-new.bin.txt | head
-
-# 2
-echo cbmbasic2
-ca65 -D CBM2 msbasic.s -o tmp/cbmbasic2.o &&
-ld65 -C cbmbasic1.cfg tmp/cbmbasic2.o -o tmp/cbmbasic2-new.bin && 
-xxd -g 1 orig/cbmbasic2.bin > tmp/cbmbasic2.bin.txt
-xxd -g 1 tmp/cbmbasic2-new.bin > tmp/cbmbasic2-new.bin.txt
-diff -u tmp/cbmbasic2.bin.txt tmp/cbmbasic2-new.bin.txt | head
-
-#da65 --info del/cbmbasic2-temp.txt 
-
-# 1.1
-#echo applesoft
-#ca65 -D APPLE msbasic.s -o tmp/applesoft.o &&
-#ld65 -C applesoft.cfg tmp/applesoft.o -o tmp/applesoft-new.bin && 
-#xxd -g 1 orig/applesoft.bin > tmp/applesoft.bin.txt
-#xxd -g 1 tmp/applesoft-new.bin > tmp/applesoft-new.bin.txt
-#diff -u tmp/applesoft.bin.txt tmp/applesoft-new.bin.txt | head
 #da65 --info applesoft-temp.txt 
diff --git a/msbasic.s b/msbasic.s
index 99f9239..b7a7710 100644
--- a/msbasic.s
+++ b/msbasic.s
@@ -1,6 +1,9 @@
 ; Microsoft BASIC for 6502
 
-.ifdef CBM1
+.debuginfo +
+
+.ifdef cbmbasic1
+CBM1 := 1
 .include "defines_cbm.s" ; 6
 CONFIG_CBM_ALL := 1
 CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
@@ -9,7 +12,8 @@ CBM_APPLE := 1
 CONFIG_DATAFLAG := 1
 .endif
 
-.ifdef OSI
+.ifdef osi
+OSI := 1
 .include "defines_osi.s"; 2
 CONFIG_SMALL := 1
 CONFIG_SCRTCH_ORDER := 1
@@ -18,7 +22,8 @@ CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_DATAFLAG := 1
 .endif
 
-.ifdef APPLE
+.ifdef applesoft
+APPLE := 1
 .include "defines_apple.s"; 10
 CONFIG_11 := 1
 CBM2_APPLE := 1
@@ -32,7 +37,8 @@ CONFIG_PRINT_CR := 1 ; print CR when line end reached
 ; INPUTBUFFER > $0100
 .endif
 
-.ifdef KIM
+.ifdef kb9
+KIM := 1
 .include "defines_kim.s" ; 7
 KIM_KBD := 1
 CONFIG_11 := 1
@@ -44,7 +50,8 @@ CONFIG_NULL := 1
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
 .endif
 
-.ifdef CBM2
+.ifdef cbmbasic2
+CBM2 := 1
 .include "defines_cbm.s" ; 11
 CONFIG_CBM_ALL := 1
 CONFIG_11 := 1
@@ -58,7 +65,8 @@ CONFIG_DATAFLAG := 1
 ; INPUTBUFFER > $0100
 .endif
 
-.ifdef KBD
+.ifdef kbdbasic
+KBD := 1
 .include "defines_kbd.s" ; 10
 CONFIG_SCRTCH_ORDER := 1
 CONFIG_SMALL := 1