Revert VS2017.8 build fix.

Added proper preprocessor definition in Header.cmake instead.
This commit is contained in:
Jean-Philip Desjardins 2018-08-30 13:25:46 -04:00
parent 74163adeb0
commit 129a49c480
2 changed files with 3 additions and 4 deletions

View File

@ -20,7 +20,6 @@ CVpu::CVpu(unsigned int number, const VPUINIT& vpuInit, CGIF& gif, CINTC& intc,
, m_gif(gif)
, m_vuProfilerZone(CProfiler::GetInstance().RegisterZone("VU"))
#ifdef DEBUGGER_INCLUDED
, m_vuMiniState(std::make_unique<MIPSSTATE>())
, m_microMemMiniState(new uint8[(number == 0) ? PS2::MICROMEM0SIZE : PS2::MICROMEM1SIZE])
, m_vuMemMiniState(new uint8[(number == 0) ? PS2::VUMEM0SIZE : PS2::VUMEM1SIZE])
, m_topMiniState(0)
@ -59,14 +58,14 @@ void CVpu::SaveMiniState()
{
memcpy(m_microMemMiniState, m_microMem, (m_number == 0) ? PS2::MICROMEM0SIZE : PS2::MICROMEM1SIZE);
memcpy(m_vuMemMiniState, m_vuMem, (m_number == 0) ? PS2::VUMEM0SIZE : PS2::VUMEM1SIZE);
memcpy(m_vuMiniState.get(), &m_ctx->m_State, sizeof(MIPSSTATE));
memcpy(&m_vuMiniState, &m_ctx->m_State, sizeof(MIPSSTATE));
m_topMiniState = (m_number == 0) ? 0 : m_vif->GetTOP();
m_itopMiniState = m_vif->GetITOP();
}
const MIPSSTATE& CVpu::GetVuMiniState() const
{
return *m_vuMiniState;
return m_vuMiniState;
}
uint8* CVpu::GetVuMemoryMiniState() const

View File

@ -77,7 +77,7 @@ protected:
VifPtr m_vif;
#ifdef DEBUGGER_INCLUDED
std::unique_ptr<MIPSSTATE> m_vuMiniState;
MIPSSTATE m_vuMiniState;
uint8* m_microMemMiniState;
uint8* m_vuMemMiniState;
uint32 m_topMiniState;