From 7d72d8c3473e1f791daf2da08327150846a5fc33 Mon Sep 17 00:00:00 2001 From: Willy De la Court Date: Thu, 10 Jul 2025 21:01:53 +0200 Subject: [PATCH] rename VAR and not sure why but order is important --- Source/Images/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/Images/Makefile b/Source/Images/Makefile index a4c11883..064e9842 100644 --- a/Source/Images/Makefile +++ b/Source/Images/Makefile @@ -36,16 +36,18 @@ OBJECTS += $(HD1KIMGS) $(HD1KXIMGS) $(HD1KPREFIX) # OBJECTS = +# add base images used in *.def files + +BASEIMG = $(shell grep -vEh "^\#" *.def) +BASEIMG := $(addprefix hd512_,$(BASEIMG)) $(addprefix hd1k_,$(BASEIMG)) +BASEIMG := $(addsuffix .img,$(BASEIMG)) +OBJECTS += $(BASEIMG) + TEMP = $(wildcard *.def) TEMP := $(addprefix hd512_,$(TEMP)) $(addprefix hd1k_,$(TEMP)) TEMP := $(TEMP:.def=.img) OBJECTS += $(TEMP) -TEMP2 = $(shell grep -vEh "^\#" *.def) -TEMP2 := $(addprefix hd512_,$(TEMP2)) $(addprefix hd1k_,$(TEMP2)) -TEMP2 := $(addsuffix .img,$(TEMP2)) -OBJECTS += $(TEMP2) - OTHERS = blank144 blankhd512 blankhd1k *.cat