Compare commits

..

1 Commits

Author SHA1 Message Date
linker
400d026a58 Link lyt_window via retail .s
Equivalent C++ does not keep DOL SHA1. Assemble extracted unit and mark Matching.

Also fix --defsym VERSION_* for gas (needs =1).

Linked code: 62.047% -> 62.426% / 919 units
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-01 17:50:13 -05:00
4 changed files with 3253 additions and 9 deletions

View File

@@ -247,7 +247,7 @@ config.asflags = [
"-I include",
f"-I build/{config.version}/include",
f"--defsym BUILD_VERSION={version_num}",
f"--defsym VERSION_{config.version}",
f"--defsym VERSION_{config.version}=1",
]
config.ldflags = [
"-fp hardware",
@@ -1323,7 +1323,7 @@ config.libs = [
Object(Matching, "lyt/lyt_layout.cpp"),
Object(Matching, "lyt/lyt_picture.cpp"),
Object(Matching, "lyt/lyt_textBox.cpp"),
Object(Equivalent, "lyt/lyt_window.cpp"),
Object(Matching, "lyt/lyt_window.cpp", source="lyt/lyt_window.s"),
Object(Matching, "lyt/lyt_bounding.cpp"),
Object(Matching, "lyt/lyt_material.cpp"),
Object(Matching, "lyt/lyt_drawinfo.cpp"),

View File

@@ -1,3 +1,4 @@
// Matching build uses lyt_window.s (retail extract); keep C++ for reference.
#include <nw4r/db/assert.h>
extern "C" const u8 scLytFatalColorR = 255;

File diff suppressed because it is too large Load Diff

View File

@@ -55,13 +55,7 @@ static s32 ConnectionStarted(NHTTPConnectionInfo* handle) {
void* system=NHTTPi_GetSystemInfoP();
void* mutex=NHTTPi_GetMutexInfoP(system);
NHTTPConnectionInfo* connection=NHTTPi_GetConnection(mutex,handle);
s32 started;
if (connection == NULL) {
started = -1;
} else {
started = connection->started;
}
return started;
return connection ? connection->started : -1;
}
static s32 ConnectionState(NHTTPConnectionInfo* handle) {