diff --git a/.gitignore b/.gitignore index 27c775cb..9dd796fd 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ src/*.s tags tools/agbcc tools/binutils +translations/*.bin types_*.taghl *.zip !calcrom.pl diff --git a/INSTALL.md b/INSTALL.md index ad4f2697..52053fd2 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -37,7 +37,7 @@ To set up the repository: sh install.sh ../tmc cd ../tmc - make tools + make setup To build **tmc.gba**: diff --git a/Makefile b/Makefile index ed71b35f..a4c4568c 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s) ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS)) -DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s) +DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s $(DATA_ASM_SUBDIR)/**/*.s) DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS)) SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s) @@ -161,6 +161,7 @@ include songs.mk sound/%.bin: sound/%.aif ; $(AIF) $< $@ sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $(