From a0dc7cd9e471be3864cddc67ea1d7e13f073065a Mon Sep 17 00:00:00 2001 From: mrdudz Date: Thu, 15 Oct 2020 18:41:17 +0200 Subject: [PATCH] fix grc example, fix makefiles to compile grc example correctly --- samples/geos/Makefile | 11 +++++++++++ samples/geos/grc/Makefile | 10 ---------- samples/geos/grc/vlir0.s | 8 ++++---- samples/geos/grc/vlir1.s | 8 ++++---- samples/geos/grc/vlir2.s | 8 ++++---- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/samples/geos/Makefile b/samples/geos/Makefile index cc0d52a4e..cbc1e9885 100644 --- a/samples/geos/Makefile +++ b/samples/geos/Makefile @@ -33,11 +33,20 @@ else SP := $(if $(wildcard ../../bin/sp65*),../../bin/sp65,sp65) endif +DIRLIST = grc + +define SUBDIR_recipe + +@$(MAKE) -C $(dir) --no-print-directory $@ + +endef # SUBDIR_recipe + # omitted: dialog.c grphstr.c inittab.c menu.c # TODO: geosconio.cvt rmvprot.cvt samples: bitmap-demo.cvt filesel.cvt geosver.cvt getid.cvt hello1.cvt hello2.cvt \ overlay-demo.cvt vector-demo.cvt yesno.cvt + $(foreach dir,$(DIRLIST),$(SUBDIR_recipe)) bitmap.c: logo.pcx $(SP) -r logo.pcx -c geos-bitmap -w bitmap.c,ident=bitmap @@ -77,6 +86,8 @@ yesno.cvt: yesnores.grc yesno.c clean: + $(RM) overlay-demores.h $(RM) bitmap.c $(RM) *.cvt $(RM) *.map + $(foreach dir,$(DIRLIST),$(SUBDIR_recipe)) diff --git a/samples/geos/grc/Makefile b/samples/geos/grc/Makefile index 0e5eabd81..4dbe51d10 100644 --- a/samples/geos/grc/Makefile +++ b/samples/geos/grc/Makefile @@ -29,16 +29,7 @@ else GRC := $(if $(wildcard ../../../bin/grc65*),../../../bin/grc65,grc65) endif -DIRLIST = grc - -define SUBDIR_recipe - -@$(MAKE) -C $(dir) --no-print-directory $@ - -endef # SUBDIR_recipe - samples: test.s vlir.cvt - $(foreach dir,$(DIRLIST),$(SUBDIR_recipe)) test.s: test.grc $(GRC) -s test.s test.grc @@ -59,4 +50,3 @@ clean: $(RM) test.s test.h $(RM) vlir.s vlir.cvt vlir.c vlir.h $(RM) *.o - $(foreach dir,$(DIRLIST),$(SUBDIR_recipe)) diff --git a/samples/geos/grc/vlir0.s b/samples/geos/grc/vlir0.s index a54d406df..fd869835c 100644 --- a/samples/geos/grc/vlir0.s +++ b/samples/geos/grc/vlir0.s @@ -5,10 +5,10 @@ ; include some GEOS defines - .include "../../libsrc/geos-common/const.inc" - .include "../../libsrc/geos-cbm/jumptab.inc" - .include "../../libsrc/geos-cbm/geossym.inc" - .include "../../libsrc/geos-common/geosmac.inc" + .include "../../../libsrc/geos-common/const.inc" + .include "../../../libsrc/geos-cbm/jumptab.inc" + .include "../../../libsrc/geos-cbm/geossym.inc" + .include "../../../libsrc/geos-common/geosmac.inc" ; import load addresses for all VLIR chains ; these labels are defined upon linking with ld65 diff --git a/samples/geos/grc/vlir1.s b/samples/geos/grc/vlir1.s index 6ee3cca37..170442af7 100644 --- a/samples/geos/grc/vlir1.s +++ b/samples/geos/grc/vlir1.s @@ -5,10 +5,10 @@ ; include some GEOS defines - .include "../../libsrc/geos-common/const.inc" - .include "../../libsrc/geos-cbm/jumptab.inc" - .include "../../libsrc/geos-cbm/geossym.inc" - .include "../../libsrc/geos-common/geosmac.inc" + .include "../../../libsrc/geos-common/const.inc" + .include "../../../libsrc/geos-cbm/jumptab.inc" + .include "../../../libsrc/geos-cbm/geossym.inc" + .include "../../../libsrc/geos-common/geosmac.inc" ; export names of functions that will be used in the main program diff --git a/samples/geos/grc/vlir2.s b/samples/geos/grc/vlir2.s index 4c02983ff..8dfb79464 100644 --- a/samples/geos/grc/vlir2.s +++ b/samples/geos/grc/vlir2.s @@ -5,10 +5,10 @@ ; similar to vlir1.s except the fact that this is chain #2 - .include "../../libsrc/geos-common/const.inc" - .include "../../libsrc/geos-cbm/jumptab.inc" - .include "../../libsrc/geos-cbm/geossym.inc" - .include "../../libsrc/geos-common/geosmac.inc" + .include "../../../libsrc/geos-common/const.inc" + .include "../../../libsrc/geos-cbm/jumptab.inc" + .include "../../../libsrc/geos-cbm/geossym.inc" + .include "../../../libsrc/geos-common/geosmac.inc" .export OVERLAY2_Function1 .export OVERLAY2_Function2