diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index 4956ad3b..820da885 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -127,17 +127,8 @@ MetroidBuildInfo: .ascii "!#$MetroidBuildInfo!#$" .global BuildString BuildString: -#.asciz "PAD_PAD_PAD_PAD_PAD_PAD_PAD_PAD_PAD" -.if version == 2 - .asciz "Build v1.097 12/19/2002 16:03:43" - .asciz "AD" -.elseif version == 1 - .asciz "Build v1.093 11/5/2002 19:50:01" - .asciz "PAD" -.else - .asciz "Build v1.088 10/29/2002 2:21:25" - .asciz "PAD" -.endif + # Replaced after build + .asciz "PAD_PAD_PAD_PAD_PAD_PAD_PAD_PAD_PAD" .balign 4 .global lbl_803CC5C4 diff --git a/configure.py b/configure.py index 3b613099..fcd641ab 100755 --- a/configure.py +++ b/configure.py @@ -1192,7 +1192,7 @@ n.rule(name="as", command="$devkitppc/bin/powerpc-eabi-as $asflags -o $out $in - n.newline() if ENABLE_STATIC_LIBS: n.rule(name="ar", command="$devkitppc/bin/powerpc-eabi-ar crs $out $in", - description="AR $out") + description="AR $out") n.newline() n.rule(name="link", command="$wine tools/mwcc_compiler/$mwcc_version/mwldeppc.exe $ldflags -o $out @$out.rsp", description="LINK $out", rspfile="$out.rsp", rspfile_content="$in") @@ -1262,9 +1262,12 @@ n.newline() ### n.comment("main.dol") n.build("build/elf2dol", "cc", "tools/elf2dol.c") -n.rule(name="elf2dol", command="build/elf2dol $in $out", description="DOL $out") -n.build("$builddir/main.dol", "elf2dol", - "$builddir/main.elf", implicit="build/elf2dol") +n.build("build/metroidbuildinfo", "cc", "tools/metroidbuildinfo.c") +n.rule(name="elf2dol", + command="build/elf2dol $in $out && build/metroidbuildinfo $out buildstrings/mp1.$version.build", + description="DOL $out") +n.build("$builddir/main.dol", "elf2dol", "$builddir/main.elf", + implicit=["build/elf2dol", "build/metroidbuildinfo"]) n.newline() ###