Added MM decomp as submodule and added workaround file to avoid needing to build it

This commit is contained in:
Mr-Wiseguy 2023-12-18 19:26:47 -05:00
parent 92a95eecc7
commit 32cb89ed76
4 changed files with 15 additions and 1 deletions

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "lib/freetype-windows-binaries"] [submodule "lib/freetype-windows-binaries"]
path = lib/freetype-windows-binaries path = lib/freetype-windows-binaries
url = https://github.com/ubawurinna/freetype-windows-binaries url = https://github.com/ubawurinna/freetype-windows-binaries
[submodule "lib/mm-decomp"]
path = lib/mm-decomp
url = https://github.com/zeldaret/mm

1
lib/mm-decomp Submodule

@ -0,0 +1 @@
Subproject commit 5607eec18bae68e4cd38ef6d1fa69d7f1d84bfc8

View File

@ -5,7 +5,7 @@ LD := ld.lld
OBJCOPY := llvm-objcopy OBJCOPY := llvm-objcopy
CFLAGS := -target mips -mips2 -mabi=32 -O2 -mno-abicalls -mno-odd-spreg -fomit-frame-pointer -mno-check-zero-division -G0 -Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable -Wno-missing-braces CFLAGS := -target mips -mips2 -mabi=32 -O2 -mno-abicalls -mno-odd-spreg -fomit-frame-pointer -mno-check-zero-division -G0 -Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable -Wno-missing-braces
CPPFLAGS := -nostdinc -D_LANGUAGE_C -DMIPS -I ../../mm/include -I ../../mm/src -I ../../mm/build -I ../../mm/assets -I../lib/RT64-HLE/include CPPFLAGS := -nostdinc -D_LANGUAGE_C -DMIPS -I. -I ../lib/mm-decomp/include -I ../lib/mm-decomp/src -I ../lib/mm-decomp/assets -I../lib/RT64-HLE/include
LDFLAGS := -nostdlib -T patches.ld -T syms.ld --just-symbols=../mm.us.rev1.elf --allow-multiple-definition LDFLAGS := -nostdlib -T patches.ld -T syms.ld --just-symbols=../mm.us.rev1.elf --allow-multiple-definition
BINFLAGS := -O binary BINFLAGS := -O binary

View File

@ -0,0 +1,10 @@
// Required to include MM decomp headers without having built the repo
#ifndef SUB_S_H
#define SUB_S_H 1
extern Vtx codeVtx_120260[];
extern Gfx gShadowMaterialDL[];
extern Gfx gShadowModelDL[];
#endif