From 5b0ee0915eb2fa01d4457cf4e37e4ccec33fd302 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 17 Jun 2024 00:31:45 -0400 Subject: [PATCH] riven: fix up Makefiles so builds from scratch --- games/riven_hgr/disk39_files/Makefile | 12 ++++++++++-- .../disk39_files/movie_maglev_flip/Makefile | 3 +++ .../disk39_files/movie_maglev_flip/overlays/Makefile | 4 ++-- .../disk39_files/movie_maglev_ride/Makefile | 4 ++++ .../disk39_files/movie_maglev_ride/overlays/Makefile | 4 ++-- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/games/riven_hgr/disk39_files/Makefile b/games/riven_hgr/disk39_files/Makefile index 23336135..26374650 100644 --- a/games/riven_hgr/disk39_files/Makefile +++ b/games/riven_hgr/disk39_files/Makefile @@ -61,7 +61,8 @@ MOVIE_MAGLEV_FLIP: movie_maglev_flip.o movie_maglev_flip.o: movie_maglev_flip.s \ ../zp.inc ../hardware.inc ../qload.inc \ ../common_defines.inc disk39_defines.inc \ - movie_maglev_flip/movie_maglev_flip.inc + movie_maglev_flip/movie_maglev_flip.inc \ + movie_maglev_flip/overlays/combined_overlays.zx02 ca65 -o movie_maglev_flip.o movie_maglev_flip.s -l movie_maglev_flip.lst #### @@ -73,7 +74,8 @@ movie_maglev_ride.o: movie_maglev_ride.s \ ../zp.inc ../hardware.inc ../qload.inc \ ../common_defines.inc disk39_defines.inc \ end_message/end_message.gr.zx02 \ - movie_maglev_ride/movie_maglev_ride.inc + movie_maglev_ride/movie_maglev_ride.inc \ + movie_maglev_ride/overlays/overlay_combined.zx02 ca65 -o movie_maglev_ride.o movie_maglev_ride.s -l movie_maglev_ride.lst @@ -101,9 +103,15 @@ graphics_projector/projector_graphics.inc: movie_maglev_flip/movie_maglev_flip.inc: cd movie_maglev_flip && make +movie_maglev_flip/overlays/combined_overlays.zx02: + cd movie_maglev_flip/overlays && make + movie_maglev_ride/movie_maglev_ride.inc: cd movie_maglev_ride && make +movie_maglev_ride/overlays/overlay_combined.zx02: + cd movie_maglev_ride/overlays && make + #### clean: diff --git a/games/riven_hgr/disk39_files/movie_maglev_flip/Makefile b/games/riven_hgr/disk39_files/movie_maglev_flip/Makefile index 06fa1e31..1829cd56 100644 --- a/games/riven_hgr/disk39_files/movie_maglev_flip/Makefile +++ b/games/riven_hgr/disk39_files/movie_maglev_flip/Makefile @@ -63,3 +63,6 @@ movie_maglev_flip.inc: \ clean: rm -f *~ *.o *.lst *.zx02 *.gr movie_maglev_flip.inc +distclean: + rm -f *~ *.o *.lst *.zx02 *.gr movie_maglev_flip.inc + cd overlays && make clean diff --git a/games/riven_hgr/disk39_files/movie_maglev_flip/overlays/Makefile b/games/riven_hgr/disk39_files/movie_maglev_flip/overlays/Makefile index 88c38e82..09707de0 100644 --- a/games/riven_hgr/disk39_files/movie_maglev_flip/overlays/Makefile +++ b/games/riven_hgr/disk39_files/movie_maglev_flip/overlays/Makefile @@ -1,7 +1,7 @@ -include ../../../../Makefile.inc +include ../../../../../Makefile.inc ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -PNG2GR = ../../../../utils/gr-utils/png2gr +PNG2GR = ../../../../../utils/gr-utils/png2gr all: maglev_overlay.gr.zx02 maglev_overlay_mask.gr.zx02 \ combined_overlays.zx02 diff --git a/games/riven_hgr/disk39_files/movie_maglev_ride/Makefile b/games/riven_hgr/disk39_files/movie_maglev_ride/Makefile index 11118010..94dbccc3 100644 --- a/games/riven_hgr/disk39_files/movie_maglev_ride/Makefile +++ b/games/riven_hgr/disk39_files/movie_maglev_ride/Makefile @@ -205,3 +205,7 @@ movie_maglev_ride.inc: \ clean: rm -f *~ *.o *.lst *.zx02 *.gr movie_maglev_ride.inc +distclean: + rm -f *~ *.o *.lst *.zx02 *.gr movie_maglev_ride.inc + cd overlays && make clean + diff --git a/games/riven_hgr/disk39_files/movie_maglev_ride/overlays/Makefile b/games/riven_hgr/disk39_files/movie_maglev_ride/overlays/Makefile index eb1e43f0..c881661c 100644 --- a/games/riven_hgr/disk39_files/movie_maglev_ride/overlays/Makefile +++ b/games/riven_hgr/disk39_files/movie_maglev_ride/overlays/Makefile @@ -1,7 +1,7 @@ -include ../../../../Makefile.inc +include ../../../../../Makefile.inc ZX02 = ~/research/6502_compression/zx02.git/build/zx02 -PNG2GR = ../../../../utils/gr-utils/png2gr +PNG2GR = ../../../../../utils/gr-utils/png2gr all: maglev_overlay.gr.zx02 maglev_overlay_mask.gr.zx02 \ overlay_combined.zx02