Merge 'Enable setting DEBUG_MODE for C through build.py' (#2572)

Author: fenhl

ASM/Makefile

@@ -8,6 +8,10 @@ CFLAGS = -O1 -G0 -fno-reorder-blocks -march=vr4300 -mtune=vr4300 -mabi=32 -mno-g
 	-mexplicit-relocs
 CPPFLAGS = -DF3DEX_GBI_2
 
+ifdef DEBUG_MODE
+  CFLAGS += -DDEBUG_MODE=1
+endif
+
 OUTDIR := build
 OBJDIR := build/bin
 SRCDIR := c

ASM/build.py

@@ -18,13 +18,15 @@
 parser.add_argument('--dump-obj', action='store_true', help="Dumps extra object info for debugging purposes. Does nothing with --no-compile-c")
 parser.add_argument('--diff-only', action='store_true', help="Creates diff output without running armips")
 parser.add_argument('--mips-binutils-prefix', type=str, default="mips64-", help="Use a different prefix for N64 toolchain")
+parser.add_argument('--debug-c', action='store_true', help="Define DEBUG_MODE 1 for C modules")
 
 args = parser.parse_args()
 pj64_sym_path = args.pj64sym
 compile_c = not args.no_compile_c
 dump_obj = args.dump_obj
 diff_only = args.diff_only
 mips_binutils_prefix = args.mips_binutils_prefix
+debug_c = args.debug_c
 
 root_dir = os.path.dirname(os.path.realpath(__file__))
 tools_dir = os.path.join(root_dir, 'tools')
@@ -47,6 +49,8 @@
 if compile_c:
     clist = ['make']
     clist.append(f'MIPS_BINUTILS_PREFIX={mips_binutils_prefix}')
+    if debug_c:
+        clist.append(f'DEBUG_MODE=1')
     if dump_obj:
         clist.append('RUN_OBJDUMP=1')
     try:

ASM/c/debug.h

@@ -1,7 +1,9 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
+#ifndef DEBUG_MODE
 #define DEBUG_MODE 0
+#endif
 
 #include "z64.h"
 #include "gfx.h"

version.py

@@ -1,4 +1,4 @@
-__version__ = '9.1.5'
+__version__ = '9.1.6'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0