Skip to content

Commit d549fec

Browse files
committed
Add PCH for JSystem
1 parent bfeb1c0 commit d549fec

File tree

245 files changed

+536
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+536
-57
lines changed

configure.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,11 @@ def MatchingFor(*versions) -> bool:
462462
"mw_version": MWVersion(config.version),
463463
"cflags": ["-lang=c++", *cflags_dolzel_rel],
464464
},
465+
{
466+
"source": "JSystem/JSystem.pch",
467+
"mw_version": MWVersion(config.version),
468+
"cflags": ["-lang=c++", *cflags_framework],
469+
},
465470
]
466471
config.libs = [
467472
{
@@ -832,7 +837,7 @@ def MatchingFor(*versions) -> bool:
832837
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JParticle/JPAKeyBlock.cpp"),
833838
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01", "ShieldD"), "JSystem/JParticle/JPATexture.cpp"),
834839
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JParticle/JPAResourceLoader.cpp"),
835-
Object(Equivalent, "JSystem/JParticle/JPAEmitterManager.cpp"), # weak func order
840+
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAEmitterManager.cpp"),
836841
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JParticle/JPAEmitter.cpp"),
837842
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JParticle/JPAParticle.cpp"),
838843
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JParticle/JPAMath.cpp"),
@@ -941,7 +946,7 @@ def MatchingFor(*versions) -> bool:
941946
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01", "ShieldD"), "JSystem/JAudio2/JAIAudible.cpp"),
942947
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JAIAudience.cpp"),
943948
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JAISe.cpp"),
944-
Object(Equivalent, "JSystem/JAudio2/JAISeMgr.cpp"), # weak function order
949+
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISeMgr.cpp"),
945950
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISeq.cpp"),
946951
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JAudio2/JAISeqDataMgr.cpp"),
947952
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISeqMgr.cpp"),
@@ -1080,7 +1085,7 @@ def MatchingFor(*versions) -> bool:
10801085
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTFont.cpp"),
10811086
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTResFont.cpp"),
10821087
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTDbPrint.cpp"),
1083-
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTGamePad.cpp", extra_cflags=['-pragma "nosyminline on"']),
1088+
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTGamePad.cpp"),
10841089
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTException.cpp"),
10851090
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTDirectPrint.cpp"),
10861091
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/JUtility/JUTAssert.cpp"),
@@ -1125,7 +1130,7 @@ def MatchingFor(*versions) -> bool:
11251130
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTransform.cpp"),
11261131
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTexture.cpp"),
11271132
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/J3DGraphBase/J3DPacket.cpp"),
1128-
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShapeMtx.cpp", extra_cflags=['-pragma "nosyminline on"']),
1133+
Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShapeMtx.cpp"),
11291134
Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeDraw.cpp"),
11301135
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShape.cpp"),
11311136
Object(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "JSystem/J3DGraphBase/J3DMaterial.cpp"),

include/JSystem/JAudio2/JAISeMgr.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class JAISeCategoryMgr : public JAISeqDataUser {
5656
field_0x4.field_0x0 = 0;
5757
}
5858

59-
/* 800078DC */ virtual ~JAISeCategoryMgr() {}
6059
/* 8029F8B0 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
6160
/* 8029F91C */ virtual int releaseSeqData(JAISeqDataRegion const&);
6261

@@ -101,7 +100,6 @@ class JAISeMgr : public JASGlobalInstance<JAISeMgr>,
101100
/* 802A0768 */ bool startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
102101
/* 802A08D0 */ int getNumActiveSe() const;
103102

104-
/* 802A08FC */ virtual ~JAISeMgr() {}
105103
/* 802A0168 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
106104
/* 802A01D8 */ virtual int releaseSeqData(JAISeqDataRegion const&);
107105

src/JSystem/J2DGraph/J2DAnimation.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "JSystem/JSystem.h" // IWYU pragma: keep
2+
13
#include "JSystem/J2DGraph/J2DAnimation.h"
24
#include "JSystem/J2DGraph/J2DScreen.h"
35
#include "JSystem/J3DGraphBase/J3DTexture.h"

src/JSystem/J2DGraph/J2DAnmLoader.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// J2DAnmLoader
33
//
44

5+
#include "JSystem/JSystem.h" // IWYU pragma: keep
6+
57
#include "JSystem/J2DGraph/J2DAnmLoader.h"
68
#include "JSystem/JSupport/JSupport.h"
79

src/JSystem/J2DGraph/J2DGrafContext.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "JSystem/JSystem.h" // IWYU pragma: keep
2+
13
#include "JSystem/J2DGraph/J2DGrafContext.h"
24
#include "dolphin/gx.h"
35

src/JSystem/J2DGraph/J2DManage.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "JSystem/JSystem.h" // IWYU pragma: keep
2+
13
#include "JSystem/J2DGraph/J2DManage.h"
24
#include "JSystem/JSupport/JSUInputStream.h"
35
#include "string.h"
@@ -77,4 +79,4 @@ char* J2DResReference::getName(u16 idx) const {
7779
}
7880
return p_name;
7981
}
80-
}
82+
}

src/JSystem/J2DGraph/J2DMatBlock.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// Translation Unit: J2DMatBlock
44
//
55

6+
#include "JSystem/JSystem.h" // IWYU pragma: keep
7+
68
#include "JSystem/J2DGraph/J2DMatBlock.h"
79
#include "JSystem/JUtility/JUTPalette.h"
810
#include "JSystem/JUtility/JUTResFont.h"

src/JSystem/J2DGraph/J2DMaterial.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// Translation Unit: J2DMaterial
44
//
55

6+
#include "JSystem/JSystem.h" // IWYU pragma: keep
7+
68
#include "JSystem/J2DGraph/J2DMaterial.h"
79
#include "JSystem/J3DGraphBase/J3DStruct.h"
810
#include "JSystem/JKernel/JKRHeap.h"

src/JSystem/J2DGraph/J2DMaterialFactory.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// Translation Unit: J2DMaterialFactory
44
//
55

6+
#include "JSystem/JSystem.h" // IWYU pragma: keep
7+
68
#include "JSystem/J2DGraph/J2DMaterialFactory.h"
79
#include "JSystem/J2DGraph/J2DMaterial.h"
810
#include "JSystem/J2DGraph/J2DScreen.h"

src/JSystem/J2DGraph/J2DOrthoGraph.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "JSystem/JSystem.h" // IWYU pragma: keep
2+
13
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
24
#include "dolphin/gx.h"
35

@@ -90,4 +92,4 @@ void J2DDrawFrame(JGeometry::TBox2<f32> const& box, JUtility::TColor color, u8 l
9092
oGrph.setColor(color);
9193
oGrph.setLineWidth(line_width);
9294
oGrph.drawFrame(box);
93-
}
95+
}

0 commit comments

Comments
 (0)