diff --git a/files.cmake b/files.cmake index bc648dfa08..c305ab5f3f 100644 --- a/files.cmake +++ b/files.cmake @@ -445,9 +445,6 @@ set(JSYSTEM_DEBUG_FILES src/JSystem/J3DGraphLoader/J3DJointFactory.cpp src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp -) - -set(JSYSTEM_FILES src/JSystem/JStudio/JStudio/ctb.cpp src/JSystem/JStudio/JStudio/ctb-data.cpp src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -547,6 +544,7 @@ set(JSYSTEM_FILES src/JSystem/JMessage/resource.cpp src/JSystem/JMessage/locale.cpp src/JSystem/JGadget/binary.cpp + src/JSystem/JGadget/define.cpp src/JSystem/JGadget/linklist.cpp src/JSystem/JGadget/std-vector.cpp src/JSystem/JHostIO/JORHostInfo.cpp @@ -556,6 +554,9 @@ set(JSYSTEM_FILES src/JSystem/JHostIO/JHIMccBuf.cpp ) +set(JSYSTEM_FILES +) + set(REL_FILES src/f_pc/f_pc_profile_lst.cpp src/d/actor/d_a_andsw.cpp diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 6af8780515..9426611d02 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -48,7 +48,13 @@ class JORReflexible : public JOREventListener { public: #if DEBUG JORReflexible() {} +#if TARGET_PC + static JORServer* getJORServer() { + OSPanic(__FILE__, __LINE__, "getJORServer is unimplemented"); + } +#else static JORServer* getJORServer(); +#endif virtual void listenPropertyEvent(const JORPropertyEvent*); virtual void listen(u32, const JOREvent*); diff --git a/src/JSystem/JAudio2/JAISe.cpp b/src/JSystem/JAudio2/JAISe.cpp index fd75e9b7b7..4e453811a9 100644 --- a/src/JSystem/JAudio2/JAISe.cpp +++ b/src/JSystem/JAudio2/JAISe.cpp @@ -158,7 +158,11 @@ bool JAISe::prepare_getSeqData_() { switch (inner_.seMgr->getSeqDataMgr()->getSeqData(getID(), &inner_.mSeqData)) { case 0: +#if TARGET_PC + OS_REPORT("Failed In Loading Sequence Data:SE(0x%08x)\n", (u32)getID()); +#else OS_REPORT("Failed In Loading Sequence Data:SE(0x%08x)\n", *(u32*)&getID()); +#endif status_.state.unk = 2; return false; case 1: diff --git a/src/JSystem/JGadget/define.cpp b/src/JSystem/JGadget/define.cpp index a613126499..bba20fdc3c 100644 --- a/src/JSystem/JGadget/define.cpp +++ b/src/JSystem/JGadget/define.cpp @@ -70,3 +70,12 @@ JGadget_outMessage& JGadget_outMessage::operator<<(const void* data) { void JGadget_outMessage::warning(const char* file, int line, const char* message) { JUTAssertion::setWarningMessage(3, (char*)file, line, message); } + +#if TARGET_PC +JGadget_outMessage& JGadget_outMessage::operator<<(u16 value) { + char sz[64]; + snprintf(sz, sizeof(sz), "%uh", value); + + return *this << sz; +} +#endif \ No newline at end of file