diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2025-02-21 16:03:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-21 17:03:51 -0700 |
| commit | 8c6ae625aef6d07741cd8925f422f43ae24b198c (patch) | |
| tree | 741fafdf5cf11006a23a9019451082c269fe4922 /tools | |
| parent | f013a028f42a1b11134bc5f22f28e9f48236b6f0 (diff) | |
Ultralib Update (#233)
* git subrepo pull (merge) lib/ultralib
subrepo:
subdir: "lib/ultralib"
merged: "74f0eee"
upstream:
origin: "git@github.com:decompals/ultralib.git"
branch: "main"
commit: "2717d45"
git-subrepo:
version: "0.4.9"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "cce3d93"
* New ultralib fixes
* Update some includes in tools
* git subrepo commit (merge) lib/ultralib
subrepo:
subdir: "lib/ultralib"
merged: "3a702eaf"
upstream:
origin: "git@github.com:decompals/ultralib.git"
branch: "main"
commit: "48f9f908"
git-subrepo:
version: "0.4.9"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "ea10886"
* Update warnings file
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/format.py | 2 | ||||
| -rwxr-xr-x | tools/m2ctx.py | 2 | ||||
| -rw-r--r-- | tools/warnings_count/warnings_lib_current.txt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/format.py b/tools/format.py index 92490ca..be11306 100755 --- a/tools/format.py +++ b/tools/format.py @@ -29,7 +29,7 @@ APPLY_OPTS = "" # Compiler options used with Clang-Tidy # Normal warnings are disabled with -Wno-everything to focus only on tidying -INCLUDES = "-Iinclude -Isrc -Ibuild -I. -Ilib/ultralib/include -Ilib/ultralib/include/PR -Ibin/jp -Ibin/cn" +INCLUDES = "-Iinclude -Isrc -Ibuild -I. -Ilib/ultralib/include -Ilib/ultralib/include/PR -Ilib/ultralib/include/compiler/ido -Ibin/jp -Ibin/cn" DEFINES = "-D_LANGUAGE_C -DNON_MATCHING -D_MIPS_SZLONG=32" COMPILER_OPTS = f"-fno-builtin -std=gnu90 -m32 -Wno-everything {INCLUDES} {DEFINES}" diff --git a/tools/m2ctx.py b/tools/m2ctx.py index 6de20af..34584a4 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -18,7 +18,7 @@ CPP_FLAGS = [ "-Ibuild", "-Ilib/ultralib/include", "-Ilib/ultralib/include/PR", - "-Ilib/ultralib/include/ido", + "-Ilib/ultralib/include/compiler/ido", "-D_LANGUAGE_C", "-DF3DEX_GBI_2", diff --git a/tools/warnings_count/warnings_lib_current.txt b/tools/warnings_count/warnings_lib_current.txt index 517b490..6df8e3e 100644 --- a/tools/warnings_count/warnings_lib_current.txt +++ b/tools/warnings_count/warnings_lib_current.txt @@ -2,5 +2,5 @@ cc: Warning: -mips3 should not be used for ucode 32-bit compiles cc: Warning: -mips3 should not be used for ucode 32-bit compiles cc: Warning: -mips3 should not be used for ucode 32-bit compiles cc: Warning: -mips3 should not be used for ucode 32-bit compiles -as1: Warning: getintmask.s, line 21: Macro instruction used in branch delay slot -as1: Warning: interrupt.s, line 20: Macro instruction used in branch delay slot +as1: Warning: getintmask.s, line 20: Macro instruction used in branch delay slot +as1: Warning: interrupt.s, line 23: Macro instruction used in branch delay slot |