diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-04-06 11:07:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-06 11:07:58 -0700 |
| commit | 471d86f5303aa2afac56cd8cd498f1d5ab59f6ed (patch) | |
| tree | b6f519eb4bea29c435275fbacf159ae6cd308369 /docs/tutorial/data.md | |
| parent | 45ae63ccc550ea29f475669a87f7f8ac681a6b29 (diff) | |
Build Sync (#1600)
* Rename outputs
* Makefile target renames
* Add run target
* yeet z64compress
* venv
* baserom_uncompressed -> baserom-decompressed
* input rom name to baserom.z64
* Add BUILD_DIR makefile variable
* Move built roms to build dir
* Move baserom to baseroms folder
* Add version to map file name
* Makefile cleanup
* Rename ldscript to include version
* Multiversion build
* n64-us version name
* Remove venv as dependency of setup
* Readme wording
* extract_baserom.py suggestion
* Readd checksums
* Make .venv work with windows
* missed an endif
* Cleaner windows venv implementation
* Remove duplciate process
* Build process steps
* Move make_options back
* Fix schedule build directory
* Fix schedule includes
* Makefile NON_MATCHING check -> != 0
* OOT 1704 changes
* Small cleanups
* Missed 1 thing
* UNSET -> SYMS
* Update extract_baserom.py
* dmadata.py
* Small cleanup
* dmadata_start
* Format
* dmadata files
* Fix makefile comment
* Jenkins report fix
* extracted dir
* Python dependencies order in readme
Diffstat (limited to 'docs/tutorial/data.md')
| -rw-r--r-- | docs/tutorial/data.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 2c3f1d2e2..ad3fdda71 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -78,9 +78,9 @@ First, we tell the compiler to ignore the original data file. To do this, open t beginseg name "ovl_En_Recepgirl" compress - include "build/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o" - include "build/data/ovl_En_Recepgirl/ovl_En_Recepgirl.data.o" - include "build/data/ovl_En_Recepgirl/ovl_En_Recepgirl.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o" + include "$(BUILD_DIR)/data/ovl_En_Recepgirl/ovl_En_Recepgirl.data.o" + include "$(BUILD_DIR)/data/ovl_En_Recepgirl/ovl_En_Recepgirl.reloc.o" endseg ``` @@ -90,9 +90,9 @@ We will eventually remove both of the bottom two lines and replace them with our beginseg name "ovl_En_Recepgirl" compress - include "build/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o" - //include "build/data/ovl_En_Recepgirl/ovl_En_Recepgirl.data.o" - include "build/data/ovl_En_Recepgirl/ovl_En_Recepgirl.reloc.o" + include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o" + //include "$(BUILD_DIR)/data/ovl_En_Recepgirl/ovl_En_Recepgirl.data.o" + include "$(BUILD_DIR)/data/ovl_En_Recepgirl/ovl_En_Recepgirl.reloc.o" endseg ``` @@ -131,7 +131,7 @@ The game has a convenient system that allows it to sometimes effectively use off There is an obvious problem here, which is that is that these symbols have to be defined *somewhere*, or the linker will complain (indeed, if we change the ones in the array to `D_...`, even if we extern them, we get ``` -mips-linux-gnu-ld: build/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o:(.data+0x20): undefined reference to `D_0600F8F0' +mips-linux-gnu-ld: build/n64-us/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.o:(.data+0x20): undefined reference to `D_0600F8F0' ``` As we'd expect, of course: we didn't fulfil our promise that they were defined elsewhere.) |