diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-04 21:36:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 21:36:18 -0600 |
| commit | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (patch) | |
| tree | ceee3e124b987b8dd24cb3a7bba85d4effe1ef5d /Makefile | |
| parent | 646533cfa3c8c42aee3efedaadfe49e495b64892 (diff) | |
| parent | d4125fef9bc9adb95c7a5fb5b8be903b34adc510 (diff) | |
Merge pull request #543 from pret/mapdata
Convert map data to JSON
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -52,6 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) FIX := tools/gbafix/gbafix$(EXE) +MAPJSON := tools/mapjson/mapjson$(EXE) # Clear the default suffixes .SUFFIXES: @@ -97,12 +98,16 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc + rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc + find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* include graphics_file_rules.mk +include map_data_rules.mk include spritesheet_rules.mk include songs.mk @@ -121,6 +126,7 @@ include songs.mk sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress sound/%.bin: sound/%.aif ; $(AIF) $< $@ + $(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/libc.o: CFLAGS := -O2 |