mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 06:16:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #548 from Jcw87/other_compilers

Browse Source 
Improve compatibility with other compilers
This commit is contained in:
Jasper St. Pierre
2023-12-12 21:13:17 -08:00
committed by GitHub
parent 1c0e0175c0 576422fd85
commit 35f65c4e3a
28 changed files with 185 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DStruct.h
+5 -4
View File
@@ -5,6 +5,7 @@
#include "dolphin/mtx/mtx.h"
#include "dolphin/mtx/mtx44.h"
#include "dolphin/mtx/vec.h"
#include "global.h"
class J3DLightInfo {
public:
@@ -144,7 +145,7 @@ struct J3DIndTexOrderInfo {
};
struct J3DTevSwapModeInfo {
/* 0x0 */ u8 field_0x0 __attribute__((aligned(4)));
/* 0x0 */ u8 field_0x0 ALIGN_DECL(4);
/* 0x1 */ u8 field_0x1;
};
@@ -179,7 +180,7 @@ struct J3DTevStageInfo {
};
struct J3DIndTevStageInfo {
/* 0x0 */ u8 mIndStage __attribute__((aligned(4)));
/* 0x0 */ u8 mIndStage ALIGN_DECL(4);
/* 0x1 */ u8 mIndFormat;
/* 0x2 */ u8 mBiasSel;
/* 0x3 */ u8 mMtxSel;
@@ -191,7 +192,7 @@ struct J3DIndTevStageInfo {
};
struct J3DTexCoordInfo {
/* 0x0 */ u8 mTexGenType __attribute__((aligned(4)));
/* 0x0 */ u8 mTexGenType ALIGN_DECL(4);
/* 0x1 */ u8 mTexGenSrc;
/* 0x2 */ u8 mTexGenMtx;
};
@@ -216,7 +217,7 @@ struct J3DBlendInfo {
};
struct J3DTevOrderInfo {
/* 0x0 */ u8 mTexCoord __attribute__((aligned(2)));
/* 0x0 */ u8 mTexCoord ALIGN_DECL(2);
/* 0x1 */ u8 mTexMap;
/* 0x2 */ u8 mColorChan;
};
include/JSystem/JAudio/JASAudioThread.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include <dolphin/os/OSMessage.h>
#include <dolphin/os/OSThread.h>
#include "global.h"
class JKRSolidHeap;
@@ -15,7 +16,7 @@ namespace JASystem {
void start(JKRSolidHeap*, u32, u32);
extern OSThread sAudioThread;
extern u8 saAudioStack[4096] __attribute__((aligned(32)));
extern u8 saAudioStack[4096] ALIGN_DECL(32);
extern OSMessageQueue sAudioprocMQ;
extern OSMessage saAudioMsgBuf[16];
extern u32 sAudioprocMQInit;
include/JSystem/JAudio/JASDriverTables.h
+3 -2
View File
@@ -2,14 +2,15 @@
#define JASDRIVERTABLES_H
#include "dolphin/types.h"
#include "global.h"
namespace JASystem {
namespace Driver {
extern f32 C5BASE_PITCHTABLE[];
}
namespace DSPInterface {
extern u16 DSPADPCM_FILTER[] __attribute__((aligned(32)));
extern u16 DSPRES_FILTER[] __attribute__((aligned(32)));
extern u16 DSPADPCM_FILTER[] ALIGN_DECL(32);
extern u16 DSPRES_FILTER[] ALIGN_DECL(32);
}
}
include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h
+2 -2
View File
@@ -1,8 +1,8 @@
#ifndef JUTFONTDATA_ASCFONT_FIX12_H
#define JUTFONTDATA_ASCFONT_FIX12_H
#include "dolphin/types.h"
#include "global.h"
extern const u8 JUTResFONT_Ascfont_fix12[] __attribute__((aligned(32)));
extern const u8 JUTResFONT_Ascfont_fix12[] ALIGN_DECL(32);
#endif /* JUTFONTDATA_ASCFONT_FIX12_H */