diff options
| author | mid-kid <esteve.varela@gmail.com> | 2021-12-19 20:05:40 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2021-12-20 16:29:12 +0100 |
| commit | 99a038284bcbbf3a0f5ee95982f761a71a72850d (patch) | |
| tree | f2575fd7032283ac97c8a7181286ef80055919ba /data/data.s | |
| parent | bc43a77380f2265481c7e6ca3a42d631f658a7ab (diff) | |
Translate all .include to #include
This decision was made to reduce the complexity of using .include whilst
juggling with tools/scaninc and tools/preproc:
- tools/scaninc doesn't apply the proper search rules for .include (it
assumes #include behavior). In particular, it doesn't consider paths
starting from $PWD, and doesn't scan the included files as a result.
- .include had to be processed before #include by preproc in many cases,
as code was being included that had to be preprocessed by CPP (think
of #define). This contradicts standard GCC behavior.
To make include paths consistent across the asm/ data/ and src/
directories, the following files were moved:
- constants/ → include/asm/constants/
- asm/macros/ → include/asm/macros/
- asm/macros.inc → include/asm/macros.inc
- include/macros/m4a.inc → include/asm/macros/m4a.inc
As part of the necessary changes for this to work, the scaninc method in
the makefile was improved to generate .d files that don't choke when
files are missing.
Diffstat (limited to 'data/data.s')
| -rw-r--r-- | data/data.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/data.s b/data/data.s index c51e2d1..e00d0ce 100644 --- a/data/data.s +++ b/data/data.s @@ -99,7 +99,7 @@ gLoadScreenBackgroundPaletteFileNames: @ 80B6A28 .4byte titlen1p_text .4byte titlen2p_text - .include "data/text/save.inc" + #include "text/save.inc" .global gUnknown_80B6D90 gUnknown_80B6D90: @ 80B6D90 |