diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2018-12-30 21:31:05 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 21:31:05 +0530 |
| commit | e28c37e4757dda735710d6bb1c3b624eccce476e (patch) | |
| tree | 22449e8635b4ca196abd4341899de72972d1d50e | |
| parent | 264db232374fd676e7f802fb1030d2275c96ee4d (diff) | |
| parent | 166d4b111f99ae4b6db7a14b3024563af83810a5 (diff) | |
Merge pull request #3 from pret/master
Taking files
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | 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 @@ -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 $@ $< |