diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-03-22 21:00:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-22 18:00:51 -0700 |
| commit | 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a (patch) | |
| tree | 285129a59d3939a79d1d2867413fe4a1fb5aa280 /include/JSystem/JStudio | |
| parent | d0f89e41b1c2dd8b434cf8a63278757b4fc8b84f (diff) | |
Debug version now builds OK and all_source compiles (#2343)
* Fix missing arg to JUT_ASSERT
* Fix some MWCC version diff errors
* Compile m_Do_ext, d_demo, actor_mng
* Add VSCode task to quickly switch between versions
* Unlink magLift for debug
* Update the hash of the debug dol
The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment.
The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol.
The DOL now builds OK.
* Fix all debug REL dtor splits
All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.
* Add genMessage declarations to all HIO subclasses
* Fixing more compilation errors
* m_Do_mtx 100% on debug
Cannot be linked due to weak function name mangling?
* Improve various matches
* Fix all remaining compilation errors
* Fix new compilation errors from main
* Fix retail regression
* Link f_pc_profile_lst
Diffstat (limited to 'include/JSystem/JStudio')
| -rw-r--r-- | include/JSystem/JStudio/JStudio/jstudio-object.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JStudio/JStudio_JStage/control.h | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 182b2bbc43..a9b411a1f1 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -178,6 +178,8 @@ struct TAdaptor { /* 80286648 */ static void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*, u32, void const*, u32); + const char* adaptor_getID_string() const; + void adaptor_setObject_(const TObject* pObject) { pObject_ = pObject; } diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 19d7f69ba5..45052de6f7 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -157,7 +157,10 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T JStage::TActor* get_pJSG_() { return (JStage::TActor*) pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVVOutputObject saoVVOutput_[2]; +#endif static TVVOutput_ANIMATION_FRAME_ saoVVOutput_ANIMATION_FRAME_[3]; /* 0x130 */ u32 field_0x130; @@ -220,7 +223,10 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera, public TAdaptor_object JStage::TCamera* get_pJSG_() { return (JStage::TCamera*)pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVVOutput saoVVOutput_[5]; +#endif /* 0x108 */ int field_0x108; /* 0x10C */ JStage::TObject* field_0x10c; @@ -248,7 +254,10 @@ struct TAdaptor_fog : public JStudio::TAdaptor_fog, public TAdaptor_object_ { JStage::TFog* get_pJSG_() { return (JStage::TFog*)pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVariableValueOutput_object_<TAdaptor_fog, JStage::TFog> saoVVOutput_[3]; +#endif }; struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_ { |