Improving standard compiler compatibility (#2926)

* Adding explicit dolphin/ prefix & fix characters

* Rename ShiftJIS to SJIS

* Separate JASSeqReader read methods implementation between compilers.

* Fix pointer.h

* fix d_item_data typo

* fix gcn matching issue

13 files changed, 35 insertions, 10 deletions

diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/include/JSystem/JAudio2/JASSeqReader.h
index 8080a4a8b6..24cc48a1d7 100644
--- a/include/JSystem/JAudio2/JASSeqReader.h
+++ b/include/JSystem/JAudio2/JASSeqReader.h
@@ -37,11 +37,23 @@ public:
     u8* getCur() { return field_0x04; }
     u32 readByte() { return *field_0x04++; }
     u32 read16() {
+#ifdef __MWERKS__
         return *((u16*)field_0x04)++;
+#else
+        u16* value = (u16*)field_0x04;
+        field_0x04 += 2;
+        return *value;
+#endif
     }
     u32 read24() {
         field_0x04--;
+#ifdef __MWERKS__
         return (*((u32*)field_0x04)++) & 0x00ffffff;
+#else
+        u32* value = (u32*)field_0x04;
+        field_0x04 += 4;
+        return (*value) & 0x00ffffff;
+#endif
     }
     u16 getLoopCount() const { 
         if (field_0x08 == 0) {
diff --git a/include/JSystem/JGadget/pointer.h b/include/JSystem/JGadget/pointer.h
index ac38df93f9..9ea7c3af7d 100644
--- a/include/JSystem/JGadget/pointer.h
+++ b/include/JSystem/JGadget/pointer.h
@@ -15,10 +15,17 @@ public:
 template<class T>
 class TPointer_delete : public TPointer<T> {
 public:
+#ifdef __MWERKS__
     TPointer_delete(T* ptr) : TPointer(ptr) {}
     ~TPointer_delete() {
         delete mPtr;
     }
+#else
+    TPointer_delete(T* ptr) : TPointer<T>(ptr) {}
+    ~TPointer_delete() {
+        delete this->mPtr;
+    }
+#endif
 };
 
 }
diff --git a/include/JSystem/JHostIO/JHIRMcc.h b/include/JSystem/JHostIO/JHIRMcc.h
index 6b79187c56..9e8c00ca39 100644
--- a/include/JSystem/JHostIO/JHIRMcc.h
+++ b/include/JSystem/JHostIO/JHIRMcc.h
@@ -1,7 +1,7 @@
 #ifndef JHIRMCC_H
 #define JHIRMCC_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 struct JHIMccContext;
 
diff --git a/include/JSystem/JHostIO/JORHostInfo.h b/include/JSystem/JHostIO/JORHostInfo.h
index 2eb43c5184..965b00ef93 100644
--- a/include/JSystem/JHostIO/JORHostInfo.h
+++ b/include/JSystem/JHostIO/JORHostInfo.h
@@ -1,7 +1,7 @@
 #ifndef JORHOSTINFO_H
 #define JORHOSTINFO_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #define HOSTINFO_REQ_COMPUTER_NAME 0
 #define HOSTINFO_REQ_USERNAME      1
diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h
index daf8bbc5f5..b0fe008186 100644
--- a/include/JSystem/JHostIO/JORMContext.h
+++ b/include/JSystem/JHostIO/JORMContext.h
@@ -1,7 +1,7 @@
 #ifndef JORMCONTEXT_H
 #define JORMCONTEXT_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <stdint.h>
 #include "JSystem/JHostIO/JORReflexible.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
diff --git a/include/JSystem/JMath/random.h b/include/JSystem/JMath/random.h
index cfb8ecc1aa..273ab97c12 100644
--- a/include/JSystem/JMath/random.h
+++ b/include/JSystem/JMath/random.h
@@ -42,7 +42,7 @@ public:
     TRandom_(u32 value) : RandomT(value) {}
 
     u8 get_uint8(u8 param_0) {
-        return get_ufloat_1() * param_0;
+        return this->get_ufloat_1() * param_0;
     }
 };
 
diff --git a/include/JSystem/JMessage/JMessage.h b/include/JSystem/JMessage/JMessage.h
index f727dd390e..a097187998 100644
--- a/include/JSystem/JMessage/JMessage.h
+++ b/include/JSystem/JMessage/JMessage.h
@@ -1,7 +1,7 @@
 #ifndef JMESSAGE_H
 #define JMESSAGE_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 // Struct definitions might be wrong
 typedef struct bmg_header_t {
diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h
index fca67aa3e6..c5dc58512a 100644
--- a/include/JSystem/JMessage/locale.h
+++ b/include/JSystem/JMessage/locale.h
@@ -1,7 +1,7 @@
 #ifndef JMESSAGE_LOCALE_H
 #define JMESSAGE_LOCALE_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 namespace JMessage {
 
diff --git a/include/JSystem/JStudio/JStudio/fvb-data-parse.h b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
index 7e9ae92f55..1caa417550 100644
--- a/include/JSystem/JStudio/JStudio/fvb-data-parse.h
+++ b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
@@ -27,7 +27,7 @@ public:
         return ret;
     }
     const void* getContent() const {
-        return (const void*)((int)getBlockEnd_() + align_roundUp(get_IDSize(), 4));
+        return (const void*)((intptr_t)getBlockEnd_() + align_roundUp(get_IDSize(), 4));
     }
 };
 
diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h
index 8a652dd722..0b9a37aec5 100644
--- a/include/JSystem/JSupport/JSupport.h
+++ b/include/JSystem/JSupport/JSupport.h
@@ -1,7 +1,7 @@
 #ifndef JSUPPORT_H
 #define JSUPPORT_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <stdint.h>
 
 /**
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index b2e5403de8..0df3f24640 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 typedef void (*callbackFn)(int, void*);
 
diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h
index 78a1d98b3e..680f90bd82 100644
--- a/include/f_pc/f_pc_debug_sv.h
+++ b/include/f_pc/f_pc_debug_sv.h
@@ -2,7 +2,7 @@
 #ifndef F_PC_DEBUG_SV_H_
 #define F_PC_DEBUG_SV_H_
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #if DEBUG
 
diff --git a/include/global.h b/include/global.h
index 42990950e1..63e3defa45 100644
--- a/include/global.h
+++ b/include/global.h
@@ -113,4 +113,10 @@ static const float INF = 2000000000.0f;
     (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
     (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0;
 
+#ifdef __MWERKS__
+#define SJIS(character, value) character
+#else
+#define SJIS(character, value) ((u32)value)
+#endif
+
 #endif