summaryrefslogtreecommitdiff
path: root/berry_fix
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-12-26 22:35:36 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-12-26 22:35:36 -0500
commit5ad6e521535c7528fd83cfc95cf6d326754aafa8 (patch)
treeb3f679d96046ee56fa46d499aa9f851cb37c787a /berry_fix
parentd5de7960a330953b3a7d7684122997c0d8aedcf1 (diff)
Fix Makefiles to allow CPP to work on piped input from preproc for data asm files.
Diffstat (limited to 'berry_fix')
-rw-r--r--berry_fix/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/berry_fix/Makefile b/berry_fix/Makefile
index d449fdbef..feb92a026 100644
--- a/berry_fix/Makefile
+++ b/berry_fix/Makefile
@@ -147,7 +147,7 @@ data/payload.gba.lz: payload/payload.gba
$(GFX) $< $@ -search 1
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
- $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
+ $(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $<