diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-05 14:27:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-05 23:27:19 +0100 |
| commit | 25ff0a27de771f631369721ce1e8ca7ad7be8cfd (patch) | |
| tree | 54b901ce526e95d5c8d4af9e14032713cb89ee53 /docs/tutorial/merging.md | |
| parent | 1f9c28f370d73268981fd8a42f9c6ac15b560a1a (diff) | |
Create separate build directories based on version (#1591)
* Create separate build directories based on version
* Fix find_unused_asm.sh
* Remove find_unused_asm.sh from Jenkinsfile
* Revert diff.py
* Clarify that gc-eu-mq is not "supported" yet
* Revert xmlcreate.py (to be deleted)
* Remove gc-eu-mq for now
* Add version flags to diff_settings.py and sym_info.py
* --version -> --oot-version
* Fix --oot-version
* Revert adding version flags to tools
* Delete find_unused_asm.sh
* Revert changes to first_diff.py output in tutorial
* Factor out sed usages for spec
Diffstat (limited to 'docs/tutorial/merging.md')
| -rw-r--r-- | docs/tutorial/merging.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/tutorial/merging.md b/docs/tutorial/merging.md index 8ba1aa5cb..fb51b8d58 100644 --- a/docs/tutorial/merging.md +++ b/docs/tutorial/merging.md @@ -26,9 +26,9 @@ Specifically, to use the automatically generated reloc, rather than the original ``` beginseg name "ovl_En_Jj" - include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o" - //include "build/data/overlays/actors/z_en_jj.data.o" - include "build/data/overlays/actors/z_en_jj.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/z_en_jj.o" + //include "$(BUILD_DIR)/data/overlays/actors/z_en_jj.data.o" + include "$(BUILD_DIR)/data/overlays/actors/z_en_jj.reloc.o" endseg ``` @@ -37,8 +37,8 @@ and change to use our reloc: ``` beginseg name "ovl_En_Jj" - include "build/src/overlays/actors/ovl_En_Jj/z_en_jj.o" - include "build/src/overlays/actors/ovl_En_Jj/ovl_En_Jj_reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/z_en_jj.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Jj/ovl_En_Jj_reloc.o" endseg ``` |