From 59a328cfcf4facf57ca6e5502a760129dc2bd74e Mon Sep 17 00:00:00 2001
From: alpine9000 <alex.g.brown@gmail.com>
Date: Sat, 27 Feb 2016 14:52:57 +1100
Subject: [PATCH] 002.sprite_display uses shared Makefile

---
 002.sprite_display/Makefile    | 38 +++-------------------------------
 002.sprite_display/bootblock.s | 36 --------------------------------
 2 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 002.sprite_display/bootblock.s

diff --git a/002.sprite_display/Makefile b/002.sprite_display/Makefile
index c0a8332..73c354c 100644
--- a/002.sprite_display/Makefile
+++ b/002.sprite_display/Makefile
@@ -1,37 +1,5 @@
 MAKEADF=../tools/makeadf
-FLOPPY=bin/sprite.adf
+FLOPPY=bin/image.adf
+MODULE=sprite.s
 
-all: bin out $(MAKEADF) $(FLOPPY)
-
-gdrive: all
-	cp $(FLOPPY) ~/Google\ Drive
-
-test: all
-	cp $(FLOPPY) ~/Projects/amiga/test.adf
-
-bin:
-	mkdir bin
-
-out:
-	mkdir out
-
-$(MAKEADF): ../tools/makeadf.c
-	gcc ../tools/makeadf.c -o $(MAKEADF)
-
-$(FLOPPY): out/bootblock.bin
-	$(MAKEADF) out/bootblock.bin > $(FLOPPY)
-
-out/bootblock.bin: out/bootblock.o
-	vlink -brawbin1 $< -o $@
-
-out/bootblock.o: bootblock.s out/main.bin
-	vc -c $< -o $@
-
-out/main.o: sprite.s
-	vc -c $< -o $@
-
-out/main.bin: out/main.o
-	vlink -brawbin1 $< -o $@
-
-clean:
-	rm -rf out bin
+include ../base.mk
\ No newline at end of file
diff --git a/002.sprite_display/bootblock.s b/002.sprite_display/bootblock.s
deleted file mode 100644
index 80323b2..0000000
--- a/002.sprite_display/bootblock.s
+++ /dev/null
@@ -1,36 +0,0 @@
- 	include exec/io.i
-	include lvo/exec_lib.i
-	include devices/trackdisk.i
-	
-bootblock:
-	dc.b    "DOS",0
-	dc.l    0
-	dc.l    880
-
-bootEntry:
-	;;  a6 = Exec base
-	;;  a1 = trackdisk.device I/O request pointer
-
-	lea     $70000,a5 ; main.s entry point 
-
-	;; Load the progam from the floppy using trackdisk.device
-	move.l  #mainEnd-mainStart,IO_LENGTH(a1)
-	move.l  a5,IO_DATA(a1)
-	move.l  #mainStart-bootblock,IO_OFFSET(a1)	
-	jsr     _LVODoIO(a6) 
-
-		;; Turn off drive motor
-	move.l  #0,IO_LENGTH(a1)
-	move.w  #TD_MOTOR,IO_COMMAND(a1)
-	jsr     _LVODoIO(a6)
-	
-	jmp     (a5)	; -> main.s entry point
-	
-	;; Pad the remainder of the bootblock
-	cnop    0,1024
-
-mainStart:
-	incbin  "out/main.bin"
-	cnop    0,512
-mainEnd:
-	end
\ No newline at end of file