mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 13:13:29 -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
src/JSystem/J3DGraphBase/J3DSys.cpp
+2 -1
View File
@@ -9,6 +9,7 @@
#include "JSystem/J3DGraphBase/J3DTevs.h"
#include "JSystem/J3DGraphBase/J3DShape.h"
#include "dolphin/os/OS.h"
#include "global.h"
extern void JRNLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
extern void makeTexCoordTable();
@@ -118,7 +119,7 @@ void J3DFifoLoadNrmMtxImm3x3(Mtx33 mtx, unsigned long idx) {
GFX_FIFO(u32) = mtx_u32[8];
}
u8 NullTexData[16] __attribute__((aligned(32))) = {
u8 NullTexData[16] ALIGN_DECL(32) = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
src/JSystem/JAudio/JASSeqParser.cpp
+53 -53
View File
@@ -430,67 +430,67 @@ void JASystem::TSeqParser::parseSeq(TTrack* track) {
int (JASystem::TSeqParser::*JASystem::TSeqParser::sCmdPList[64])(JASystem::TTrack*, u32*) = {
NULL,
JASystem::TSeqParser::cmdOpenTrack,
JASystem::TSeqParser::cmdOpenTrackBros,
&JASystem::TSeqParser::cmdOpenTrack,
&JASystem::TSeqParser::cmdOpenTrackBros,
NULL,
JASystem::TSeqParser::cmdCall,
&JASystem::TSeqParser::cmdCall,
NULL,
JASystem::TSeqParser::cmdRet,
&JASystem::TSeqParser::cmdRet,
NULL,
JASystem::TSeqParser::cmdJmp,
JASystem::TSeqParser::cmdLoopS,
JASystem::TSeqParser::cmdLoopE,
JASystem::TSeqParser::cmdReadPort,
JASystem::TSeqParser::cmdWritePort,
JASystem::TSeqParser::cmdCheckPortImport,
JASystem::TSeqParser::cmdCheckPortExport,
JASystem::TSeqParser::cmdWait,
&JASystem::TSeqParser::cmdJmp,
&JASystem::TSeqParser::cmdLoopS,
&JASystem::TSeqParser::cmdLoopE,
&JASystem::TSeqParser::cmdReadPort,
&JASystem::TSeqParser::cmdWritePort,
&JASystem::TSeqParser::cmdCheckPortImport,
&JASystem::TSeqParser::cmdCheckPortExport,
&JASystem::TSeqParser::cmdWait,
NULL,
JASystem::TSeqParser::cmdParentWritePort,
JASystem::TSeqParser::cmdChildWritePort,
&JASystem::TSeqParser::cmdParentWritePort,
&JASystem::TSeqParser::cmdChildWritePort,
NULL,
JASystem::TSeqParser::cmdSetLastNote,
JASystem::TSeqParser::cmdTimeRelate,
JASystem::TSeqParser::cmdSimpleOsc,
JASystem::TSeqParser::cmdSimpleEnv,
JASystem::TSeqParser::cmdSimpleADSR,
JASystem::TSeqParser::cmdTranspose,
JASystem::TSeqParser::cmdCloseTrack,
JASystem::TSeqParser::cmdOutSwitch,
JASystem::TSeqParser::cmdUpdateSync,
JASystem::TSeqParser::cmdBusConnect,
JASystem::TSeqParser::cmdPauseStatus,
JASystem::TSeqParser::cmdSetInterrupt,
JASystem::TSeqParser::cmdDisInterrupt,
JASystem::TSeqParser::cmdClrI,
JASystem::TSeqParser::cmdSetI,
JASystem::TSeqParser::cmdRetI,
JASystem::TSeqParser::cmdIntTimer,
JASystem::TSeqParser::cmdVibDepth,
JASystem::TSeqParser::cmdVibDepthMidi,
JASystem::TSeqParser::cmdSyncCPU,
JASystem::TSeqParser::cmdFlushAll,
JASystem::TSeqParser::cmdFlushRelease,
JASystem::TSeqParser::cmdWait,
JASystem::TSeqParser::cmdPanPowSet,
JASystem::TSeqParser::cmdIIRSet,
JASystem::TSeqParser::cmdFIRSet,
JASystem::TSeqParser::cmdEXTSet,
JASystem::TSeqParser::cmdPanSwSet,
JASystem::TSeqParser::cmdOscRoute,
JASystem::TSeqParser::cmdIIRCutOff,
JASystem::TSeqParser::cmdOscFull,
JASystem::TSeqParser::cmdVolumeMode,
JASystem::TSeqParser::cmdVibPitch,
&JASystem::TSeqParser::cmdSetLastNote,
&JASystem::TSeqParser::cmdTimeRelate,
&JASystem::TSeqParser::cmdSimpleOsc,
&JASystem::TSeqParser::cmdSimpleEnv,
&JASystem::TSeqParser::cmdSimpleADSR,
&JASystem::TSeqParser::cmdTranspose,
&JASystem::TSeqParser::cmdCloseTrack,
&JASystem::TSeqParser::cmdOutSwitch,
&JASystem::TSeqParser::cmdUpdateSync,
&JASystem::TSeqParser::cmdBusConnect,
&JASystem::TSeqParser::cmdPauseStatus,
&JASystem::TSeqParser::cmdSetInterrupt,
&JASystem::TSeqParser::cmdDisInterrupt,
&JASystem::TSeqParser::cmdClrI,
&JASystem::TSeqParser::cmdSetI,
&JASystem::TSeqParser::cmdRetI,
&JASystem::TSeqParser::cmdIntTimer,
&JASystem::TSeqParser::cmdVibDepth,
&JASystem::TSeqParser::cmdVibDepthMidi,
&JASystem::TSeqParser::cmdSyncCPU,
&JASystem::TSeqParser::cmdFlushAll,
&JASystem::TSeqParser::cmdFlushRelease,
&JASystem::TSeqParser::cmdWait,
&JASystem::TSeqParser::cmdPanPowSet,
&JASystem::TSeqParser::cmdIIRSet,
&JASystem::TSeqParser::cmdFIRSet,
&JASystem::TSeqParser::cmdEXTSet,
&JASystem::TSeqParser::cmdPanSwSet,
&JASystem::TSeqParser::cmdOscRoute,
&JASystem::TSeqParser::cmdIIRCutOff,
&JASystem::TSeqParser::cmdOscFull,
&JASystem::TSeqParser::cmdVolumeMode,
&JASystem::TSeqParser::cmdVibPitch,
NULL,
NULL,
NULL,
NULL,
NULL,
JASystem::TSeqParser::cmdCheckWave,
JASystem::TSeqParser::cmdPrintf,
JASystem::TSeqParser::cmdNop,
JASystem::TSeqParser::cmdTempo,
JASystem::TSeqParser::cmdTimeBase,
JASystem::TSeqParser::cmdFinish,
&JASystem::TSeqParser::cmdCheckWave,
&JASystem::TSeqParser::cmdPrintf,
&JASystem::TSeqParser::cmdNop,
&JASystem::TSeqParser::cmdTempo,
&JASystem::TSeqParser::cmdTimeBase,
&JASystem::TSeqParser::cmdFinish,
};
src/JSystem/JFramework/JFWDisplay.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#include "JSystem/JUtility/JUTProcBar.h"
#include "dolphin/gx/GX.h"
#include "dolphin/os/OS.h"
#include "dolphin/types.h"
#include "global.h"
JFWDisplay* JFWDisplay::sManager = 0;
@@ -22,7 +22,7 @@ Mtx e_mtx = {
{0.0f, 0.0f, 1.0f, 0.0f},
};
static GXTexObj clear_z_tobj;
u8 clear_z_TX[64] __attribute__((aligned(32))) = {
u8 clear_z_TX[64] ALIGN_DECL(32) = {
0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -484,7 +484,7 @@ void JFWGXDrawDoneAutoAbort() {
if(JFWAutoAbortGfx != 0) {
OSAlarm alarm;
OSCreateAlarm(&alarm);
OSSetAlarm(&alarm, __OSBusClock >> 2, JFWGXAbortAlarmHandler);
OSSetAlarm(&alarm, OS_TIMER_CLOCK, JFWGXAbortAlarmHandler);
GXDrawDone();
OSCancelAlarm(&alarm);
}