diff options
author | Juan J. MartÃnez <jjm@usebox.net> | 2022-05-24 06:19:52 +0000 |
---|---|---|
committer | Juan J. MartÃnez <jjm@usebox.net> | 2022-05-24 06:19:52 +0000 |
commit | f829a30fc640b252972660a7c5d25dbb04a3ae8e (patch) | |
tree | c2ebd01764ae77b5238d9415efab92ebd80ea271 | |
parent | 978efe9ebb559134449bb2ecb2414bf5fe7e27c2 (diff) | |
parent | e9a8dc3bfa1911628783e41c82698cf041ce914c (diff) | |
download | ubox-msx-lib-f829a30fc640b252972660a7c5d25dbb04a3ae8e.tar.gz ubox-msx-lib-f829a30fc640b252972660a7c5d25dbb04a3ae8e.zip |
Merge branch 'master' into 'master'
automates compilation and inclusion of *.z80 files in game/src
See merge request reidrac/ubox-msx-lib!28
-rw-r--r-- | game/src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/game/src/Makefile b/game/src/Makefile index 967ed15..f0a8dae 100644 --- a/game/src/Makefile +++ b/game/src/Makefile @@ -8,7 +8,8 @@ DATA := 0xc0de OUTDIR := ../../bin TMPDIR := ../build -OBJS := $(patsubst %.c,$(TMPDIR)/%.rel,$(wildcard *.c)) $(TMPDIR)/akm.rel +OBJS := $(patsubst %.c,$(TMPDIR)/%.rel,$(wildcard *.c)) $(patsubst %.z80,$(TMPDIR)/%.rel,$(wildcard *.z80)) +OBJS := $(filter-out $(TMPDIR)/crt0.rel,$(OBJS)) UBOX_LIBS := $(wildcard ../../lib/*.lib) LIBS := -lubox -lspman -lmplayer -lap |