diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-04-06 12:41:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 12:41:44 -0400 |
| commit | 9076d63d62c847dd74b02391a4744ba83c7770e8 (patch) | |
| tree | 69cd3cd33c9457b40ac4503d69f3cf3c0604772e /Makefile | |
| parent | e225d296b72a41cbee6e16416d8d1fcfb4760445 (diff) | |
| parent | 3144b54bd1dcc47ea339fcd2bd215ec96fc38c4a (diff) | |
Merge pull request #705 from Rangi42/master
Upgrade to rgbds 0.4.0, and do miscellaneous fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -45,8 +45,8 @@ RGBLINK ?= $(RGBDS)rgblink .SECONDARY: all: crystal -crystal: pokecrystal.gbc -crystal11: pokecrystal11.gbc +crystal: pokecrystal.gbc +crystal11: pokecrystal11.gbc crystal-au: pokecrystal-au.gbc clean: @@ -66,16 +66,17 @@ tools: $(MAKE) -C tools/ -$(crystal_obj): RGBASMFLAGS = -$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL11 -$(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL11 -D _CRYSTAL_AU +RGBASMFLAGS = -L -Weverything +$(crystal_obj): RGBASMFLAGS += +$(crystal11_obj): RGBASMFLAGS += -D _CRYSTAL11 +$(crystal_au_obj): RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL_AU # The dep rules have to be explicit or else missing files won't be reported. # As a side effect, they're evaluated immediately instead of when the rule is invoked. # It doesn't look like $(shell) can be deferred so there might not be a better way. define DEP $1: $2 $$(shell tools/scan_includes $2) - $$(RGBASM) $$(RGBASMFLAGS) -L -o $$@ $$< + $$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$< endef # Build tools when building the rom. @@ -94,17 +95,14 @@ endif pokecrystal.gbc: $(crystal_obj) pokecrystal.link $(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -o $@ $(crystal_obj) $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ - tools/sort_symfile.sh pokecrystal.sym pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj) $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ - tools/sort_symfile.sh pokecrystal11.sym pokecrystal-au.gbc: $(crystal_au_obj) pokecrystal.link $(RGBLINK) -n pokecrystal-au.sym -m pokecrystal-au.map -l pokecrystal.link -o $@ $(crystal_au_obj) $(RGBFIX) -Cjv -i BYTU -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ - tools/sort_symfile.sh pokecrystal-au.sym # For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file. |