diff options
| author | Autechre | 2020-10-21 11:55:07 +0200 |
|---|---|---|
| committer | GitHub | 2020-10-21 11:55:07 +0200 |
| commit | 81040ceeaeac0a3dcb3e65798ff86f17ef9e37b9 (patch) | |
| tree | b8698007259abee3b5f4fa21c79af7edd11a4f9e | |
| parent | 19b9695a71f15ef0bf61c7c3cfd6c98ec5ccb028 (diff) | |
| parent | b6b38f881b9690c31915d019df329d02cda8344a (diff) | |
| download | pcsx_rearmed-81040ceeaeac0a3dcb3e65798ff86f17ef9e37b9.tar.gz pcsx_rearmed-81040ceeaeac0a3dcb3e65798ff86f17ef9e37b9.tar.bz2 pcsx_rearmed-81040ceeaeac0a3dcb3e65798ff86f17ef9e37b9.zip | |
Merge pull request #458 from dmorilha/fixes-for-rpi-compilation
fixes link time errors on the RPi platform (tested with 3 and 4)
| -rw-r--r-- | libpcsxcore/psxcounters.c | 4 | ||||
| -rw-r--r-- | libpcsxcore/psxcounters.h | 1 | ||||
| -rw-r--r-- | libpcsxcore/r3000a.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index bebec87..2dd7d89 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -70,8 +70,6 @@ static const s32 VerboseLevel = VERBOSE_LEVEL; /******************************************************************************/ -Rcnt rcnts[ CounterQuantity ]; - u32 hSyncCount = 0; u32 frame_counter = 0; static u32 hsync_steps = 0; @@ -496,7 +494,7 @@ s32 psxRcntFreeze( void *f, s32 Mode ) u32 count; s32 i; - gzfreeze( &rcnts, sizeof(rcnts) ); + gzfreeze( &rcnts, sizeof(*rcnts) * CounterQuantity ); gzfreeze( &hSyncCount, sizeof(hSyncCount) ); gzfreeze( &spuSyncCount, sizeof(spuSyncCount) ); gzfreeze( &psxNextCounter, sizeof(psxNextCounter) ); diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h index 4b7b6b4..d986435 100644 --- a/libpcsxcore/psxcounters.h +++ b/libpcsxcore/psxcounters.h @@ -39,6 +39,7 @@ typedef struct Rcnt u32 rate, irq, counterState, irqState; u32 cycle, cycleStart; } Rcnt; + extern Rcnt rcnts[]; void psxRcntInit(); diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c index 1118107..a8d2745 100644 --- a/libpcsxcore/r3000a.c +++ b/libpcsxcore/r3000a.c @@ -27,7 +27,6 @@ #include "gte.h" R3000Acpu *psxCpu = NULL; -psxRegisters psxRegs; int psxInit() { SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__); |