diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-12-19 18:34:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-19 18:34:50 +0000 |
| commit | 8662b35a698555be7ff762b87ebecf8a7bb2c516 (patch) | |
| tree | 87937b8dcda854251b6720dbb4e2ad1062774288 /Makefile | |
| parent | d998e8d8c51d1956249eb97429623f81b21ebf90 (diff) | |
Update z64compress (#516)
* git subrepo pull (merge) --force tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "5da31326"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "5da31326"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Update wrapper
* If building with NON_MATCHING, do not pass --matching to z64compress
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -103,6 +103,12 @@ else CC_CHECK += -m32 endif +# rom compression flags +COMPFLAGS := --threads $(N_THREADS) +ifneq ($(NON_MATCHING),1) + COMPFLAGS += --matching +endif + #### Files #### # ROM image @@ -211,7 +217,7 @@ $(ROM): $(ELF) $(ELF2ROM) -cic 6105 $< $@ $(ROMC): uncompressed - python3 tools/z64compress_wrapper.py --mb 32 --matching --threads $(N_THREADS) $(ROM) $@ $(ELF) build/$(SPEC) + python3 tools/z64compress_wrapper.py $(COMPFLAGS) $(ROM) $@ $(ELF) build/$(SPEC) $(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) build/ldscript.txt build/undefined_syms.txt $(LD) -T build/undefined_syms.txt -T build/ldscript.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map build/mm.map -o $@ |