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. --- constants/script_func_constants.inc | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 constants/script_func_constants.inc (limited to 'constants/script_func_constants.inc') diff --git a/constants/script_func_constants.inc b/constants/script_func_constants.inc deleted file mode 100644 index 157153d..0000000 --- a/constants/script_func_constants.inc +++ /dev/null @@ -1,14 +0,0 @@ -.set WAIT_START_FUNC, 0x03 -.set WAKEUP_FUNC, 0x20 -.set LOOK_AROUND_FUNC, 0x21 -.set JUMP_HAPPY_FUNC, 0x25 -.set JUMP_ANGRY_FUNC, 0x27 -.set NOTICE_FUNC, 0x28 -.set QUESTION_FUNC, 0x29 -.set SWEAT_FUNC, 0x2A -.set SHOCK_FUNC, 0x2B -.set SMILE_START_FUNC, 0x2E -.set SMILE_END_FUNC, 0x2F -.set INIT_SLEEP_FUNC, 0x35 -.set LIVES_WARP_ARRIVE_FUNC, 0x51 -.set LIVES_WARP_ARRIVE2_FUNC, 0x52 -- cgit v1.2.3