From 99a038284bcbbf3a0f5ee95982f761a71a72850d Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 19 Dec 2021 20:05:40 +0100 Subject: Translate all .include to #include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- include/macros/m4a.inc | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 include/macros/m4a.inc (limited to 'include/macros') diff --git a/include/macros/m4a.inc b/include/macros/m4a.inc deleted file mode 100644 index 6c5abc0..0000000 --- a/include/macros/m4a.inc +++ /dev/null @@ -1,13 +0,0 @@ - .macro song label, music_player, unknown - .4byte \label - .2byte \music_player - .2byte \unknown - .endm - - .macro music_player info_struct, track_struct, unknown_1, unknown_2 - .4byte \info_struct - .4byte \track_struct - .byte \unknown_1 - .space 1 - .2byte \unknown_2 - .endm -- cgit v1.2.3