fakematch JPABaseShape weak function order

This commit is contained in:
LagoLunatic
2024-01-08 17:43:34 -05:00
parent 9283694f14
commit 101a096809
3 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -564,7 +564,7 @@ config.libs = [
JSystemLib(
"JParticle",
[
Object(NonMatching, "JSystem/JParticle/JPABaseShape.cpp"),
Object(Matching, "JSystem/JParticle/JPABaseShape.cpp"),
Object(Matching, "JSystem/JParticle/JPAExtraShape.cpp"),
Object(Matching, "JSystem/JParticle/JPASweepShape.cpp"),
Object(Matching, "JSystem/JParticle/JPAExTexShape.cpp"),
+3 -1
View File
@@ -28,7 +28,9 @@ public:
static GXCompare stCompare[8];
static GXAlphaOp stAlphaOp[4];
virtual ~JPABaseShape() {}
// ~JPABaseShape should defined in the header but that breaks the order of weak functions in JPABaseShape.cpp.
// Instead we define it in JPABaseShape.cpp in order to fakematch the order and explicitly mark it as inline.
inline virtual ~JPABaseShape();
virtual u8 getType() = 0;
virtual u8 getDirType() = 0;
virtual u8 getRotType() = 0;
+2
View File
@@ -163,3 +163,5 @@ JPABaseShapeArc::JPABaseShapeArc(const u8* data, JKRHeap* pHeap) {
mpEnvColorArr = NULL;
}
}
JPABaseShape::~JPABaseShape() {}