mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-07 13:23:27 -04:00
fakematch JPABaseShape weak function order
This commit is contained in:
+1
-1
@@ -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"),
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -163,3 +163,5 @@ JPABaseShapeArc::JPABaseShapeArc(const u8* data, JKRHeap* pHeap) {
|
||||
mpEnvColorArr = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
JPABaseShape::~JPABaseShape() {}
|
||||
|
||||
Reference in New Issue
Block a user