From 01ecddaf5dc68263e1e4e689da9d913d3cfe58a2 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Fri, 4 Mar 2016 11:46:54 +1100 Subject: [PATCH] Cleaned up dir structure --- 000.trackdisk/Makefile | 2 +- 001.simple_image/Makefile | 2 +- 002.sprite_display/Makefile | 2 +- 003.music/Makefile | 2 +- 004.copper_bars/Makefile | 2 +- 005.copper_vert/Makefile | 2 +- 006.simple_blit/Makefile | 2 +- 007.masked_blit/Makefile | 2 +- README.md | 2 +- BuildingCrossDev.md => doc/BuildingCrossDev.md | 0 base.mk => shared/base.mk | 0 11 files changed, 9 insertions(+), 9 deletions(-) rename BuildingCrossDev.md => doc/BuildingCrossDev.md (100%) rename base.mk => shared/base.mk (100%) diff --git a/000.trackdisk/Makefile b/000.trackdisk/Makefile index 3b85472..29b3d81 100644 --- a/000.trackdisk/Makefile +++ b/000.trackdisk/Makefile @@ -1,4 +1,4 @@ FLOPPY=bin/test.adf MODULE=main.s -include ../base.mk \ No newline at end of file +include ../shared/base.mk \ No newline at end of file diff --git a/001.simple_image/Makefile b/001.simple_image/Makefile index 6471c11..c2e5233 100644 --- a/001.simple_image/Makefile +++ b/001.simple_image/Makefile @@ -4,7 +4,7 @@ IMAGEFILE=../assets/mission-beach.png MODULE=image.s -include ../base.mk +include ../shared/base.mk $(EXTRA): $(IMAGECON) $(IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE) --output out/image --colors 32 --quantize --output-bitplanes --output-copperlist diff --git a/002.sprite_display/Makefile b/002.sprite_display/Makefile index 665fdaa..fd4ac69 100644 --- a/002.sprite_display/Makefile +++ b/002.sprite_display/Makefile @@ -1,4 +1,4 @@ FLOPPY=bin/image.adf MODULE=sprite.s -include ../base.mk \ No newline at end of file +include ../shared/base.mk \ No newline at end of file diff --git a/003.music/Makefile b/003.music/Makefile index a73b3fc..03fb327 100644 --- a/003.music/Makefile +++ b/003.music/Makefile @@ -4,7 +4,7 @@ IMAGEFILE=../assets/mission-beach.png MODULE=music.s -include ../base.mk +include ../shared/base.mk $(EXTRA): $(IMAGECON) $(IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE) --output out/image --colors 32 --quantize --output-bitplanes --output-copperlist diff --git a/004.copper_bars/Makefile b/004.copper_bars/Makefile index c6c4f1f..3c787eb 100644 --- a/004.copper_bars/Makefile +++ b/004.copper_bars/Makefile @@ -3,7 +3,7 @@ EXTRA=out/copper-list.s MODULE=copper.s -include ../base.mk +include ../shared/base.mk out/copper-list.s: out/copper_gen ./out/copper_gen > out/copper-list.s diff --git a/005.copper_vert/Makefile b/005.copper_vert/Makefile index 9e56a32..2a1e40a 100644 --- a/005.copper_vert/Makefile +++ b/005.copper_vert/Makefile @@ -3,7 +3,7 @@ EXTRA=out/copper-list.s MODULE=copper_vert.s -include ../base.mk +include ../shared/base.mk out/copper-list.s: out/copper_gen_vert ./out/copper_gen_vert > out/copper-list.s diff --git a/006.simple_blit/Makefile b/006.simple_blit/Makefile index f0234a7..e85dcbd 100644 --- a/006.simple_blit/Makefile +++ b/006.simple_blit/Makefile @@ -8,7 +8,7 @@ EXTRA=$(IMAGEDATA) $(TC_IMAGEDATA) SHARED_PALETTE_BASE=out/shared-palette SHARED_PALETTE=$(SHARED_PALETTE_BASE).pal -include ../base.mk +include ../shared/base.mk $(SHARED_PALETTE): $(IMAGEFILE) $(TC_IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE),$(TC_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors 32 --quantize --output-palette diff --git a/007.masked_blit/Makefile b/007.masked_blit/Makefile index 13c4e2e..e97d117 100644 --- a/007.masked_blit/Makefile +++ b/007.masked_blit/Makefile @@ -9,7 +9,7 @@ EXTRA=$(IMAGEDATA) $(BOB_IMAGEDATA) SHARED_PALETTE_BASE=out/shared-palette SHARED_PALETTE=$(SHARED_PALETTE_BASE).pal -include ../base.mk +include ../shared/base.mk $(SHARED_PALETTE): $(IMAGEFILE) $(BOB_IMAGEFILE) $(IMAGECON) --input $(IMAGEFILE),$(BOB_IMAGEFILE) --output $(SHARED_PALETTE_BASE) --colors 32 --quantize --output-palette diff --git a/README.md b/README.md index 294115f..4214bd6 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ These examples are developed on a mac using [cahirwpz's](https://github.com/cahi The support tools I have developed have additional requirements which you may not have on your system. -For a dump of what I did to install them see [installing the cross development environment](BuildingCrossDev.md) +For a dump of what I did to install them see [installing the cross development environment](doc/BuildingCrossDev.md) building -------- diff --git a/BuildingCrossDev.md b/doc/BuildingCrossDev.md similarity index 100% rename from BuildingCrossDev.md rename to doc/BuildingCrossDev.md diff --git a/base.mk b/shared/base.mk similarity index 100% rename from base.mk rename to shared/base.mk