diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-05 12:49:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 12:49:31 -0400 |
| commit | 4100bf602d2463e9de07e0dfdd87a993335349db (patch) | |
| tree | c0a548e1f9ff8a3dd3e5da6154c9eb997e895d31 /Makefile | |
| parent | d323eca0eca3ff8814c63e84174d07ced99e22f9 (diff) | |
| parent | 1652a54452896b0b377c3811721ae4a7dcac1315 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -194,10 +194,10 @@ $(BUILD_DIR)/%.o: %.s $$(dep) $(AS) $(ASFLAGS) $< -o $@ arm9: - $(MAKE) -C arm9 COMPARE=$(COMPARE) GAME_LANGUAGE=$(GAME_LANGUAGE) GAME_VERSION=$(GAME_VERSION) + $(MAKE) -C arm9 $(MAKE_VARS) arm7: - $(MAKE) -C arm7 COMPARE=$(COMPARE) GAME_LANGUAGE=$(GAME_LANGUAGE) GAME_VERSION=$(GAME_VERSION) + $(MAKE) -C arm7 $(MAKE_VARS) include filesystem.mk @@ -205,7 +205,11 @@ include filesystem.mk # FIXME: Computed secure area CRC in header is incorrect due to first 8 bytes of header not actually being "encryObj" $(ROM): rom.rsf arm9 arm7 filesystem $(BNR) tools/bin/rom_header.template.sbin $(MAKEROM) -DBUILD_DIR="$(BUILD_DIR)" -DBNR="$(BNR)" -DTITLE_NAME="$(TITLE_NAME)" -DNITROFS_FILES="$(NITROFS_FILES)" $< $@ +ifeq ($(SHIFTED),0) $(FIXROM) $@ --secure-crc $(SECURE_CRC) --game-code $(GAME_CODE) +else + $(FIXROM) $@ --game-code $(GAME_CODE) +endif # Make sure build directory exists before compiling anything DUMMY != mkdir -p $(ALL_DIRS) |
