Fix wrong Makefile being pushed
This commit is contained in:
parent
d0d26294ee
commit
7f97171459
|
|
@ -10,7 +10,7 @@ endif
|
|||
CD = cd
|
||||
PRINTF = printf
|
||||
MKDIR = mkdir
|
||||
GREP = grep
|
||||
GREP = ggrep
|
||||
ZIP = zip -9 --must-match
|
||||
ZIP_NO_PATHS = $(ZIP) -j
|
||||
ifneq ($(VERSION),)
|
||||
|
|
|
|||
|
|
@ -95,6 +95,9 @@ AS = cl65
|
|||
LD = ld65
|
||||
C1541 = c1541
|
||||
CC1541 = ../../tools/cc1541/cc1541
|
||||
ZX02 = zx02/build/zx02
|
||||
ZX02_SRC = zx02
|
||||
PYTHON = python3
|
||||
|
||||
MKDIR = mkdir -p
|
||||
RM = rm -f
|
||||
|
|
@ -126,6 +129,19 @@ DISKIMAGE = $(BUILDDIR)/$(NAME)-$(_PLATFORM_).d64
|
|||
|
||||
AS_FLAGS = -Wa -I../../../shared -I ../../include -u __EXEHDR__
|
||||
|
||||
ZX0PRGS = \
|
||||
badguy.zx0.prg \
|
||||
title_320-prepared.zx0.prg \
|
||||
tower.zx0.prg \
|
||||
tower_beam.zx0.prg \
|
||||
field.zx0.prg \
|
||||
falling_star.zx0.prg \
|
||||
lilia.zx0.prg \
|
||||
lilia_hero.zx0.prg
|
||||
|
||||
LZS = \
|
||||
tilemap.bin.lz
|
||||
|
||||
|
||||
default: diskimage
|
||||
|
||||
|
|
@ -139,12 +155,10 @@ loader: $(LOADER)
|
|||
$(LOADER): $(LOADERCFG)
|
||||
make -C $(LOADER_SRC) EXTCONFIGPATH=../samples/$(NAME) PLATFORM=$(_PLATFORM_) INSTALL=1800 RESIDENT=0F00 ZP=02 prg
|
||||
|
||||
$(CC1541):
|
||||
make -C $(LOADER_SRC) cc1541
|
||||
|
||||
assemble: $(ASSEMBLE)
|
||||
|
||||
$(ASSEMBLE): $(SOURCE) $(LOADER) $(LOADERCFG)
|
||||
$(ASSEMBLE): $(SOURCE) $(LOADER) $(LOADERCFG) $(ZX0PRGS) $(LZS)
|
||||
$(MKDIR) $(BUILDDIR)
|
||||
$(MKDIR) $(INTERMDIR)
|
||||
ifeq ($(_PLATFORM_),c64)
|
||||
|
|
@ -190,8 +204,22 @@ endif
|
|||
$(INTERMDIR)/%.prg: $(RESOURCESDIR)/%.bin
|
||||
$(PRINTF) '\000\140' | $(CAT) - $? > $@ # octal 140 = hex 60
|
||||
|
||||
$(CC1541):
|
||||
make -C $(LOADER_SRC) cc1541
|
||||
|
||||
$(ZX02):
|
||||
make -C $(ZX02_SRC) build/zx02
|
||||
|
||||
%.zx0.prg: %.bin $(ZX02)
|
||||
$(ZX02) $< $<.zx0
|
||||
$(PRINTF) "\x00\x80" | cat - $<.zx0 > $@
|
||||
$(RM) $<.zx0
|
||||
|
||||
%.lz: %
|
||||
$(PYTHON) aart_lz.py $< $@
|
||||
|
||||
clean:
|
||||
-$(RM) $(ZX0PRGS) $(LZS)
|
||||
-$(RM) *.o $(ASSEMBLE) $(DISKIMAGE)
|
||||
-$(RM) -rf $(INTERMDIR)
|
||||
-$(RM) $(BUILDDIR)/loader-c64.prg
|
||||
|
|
|
|||
Loading…
Reference in a new issue