From 5ad6e521535c7528fd83cfc95cf6d326754aafa8 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 26 Dec 2018 22:35:36 -0500
Subject: Fix Makefiles to allow CPP to work on piped input from preproc for
 data asm files.

---
 .gitattributes     | 1 +
 Makefile           | 2 +-
 berry_fix/Makefile | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 7c8d2699d..a7233fe6a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,6 +10,7 @@ Makefile text eol=lf
 *.inc text eol=lf
 *.sha1 text eol=lf
 *.sed text eol=lf
+*.sh text eol=lf
 
 *.png binary
 *.bin binary
diff --git a/Makefile b/Makefile
index a2059db74..e33d1a469 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
 endif
 
 $(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 $@ $<
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 $@ $<
-- 
cgit v1.2.3