ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NOWX compilation fixes for debug 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1851 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-01-11 13:37:13 +00:00
parent 3a64c36c66
commit 8768d875d4
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -277,9 +277,11 @@ int ReadOutPBs(u32 pbs_address, AXParamBlock* _pPBs, int _num)
{ {
pDest[p] = Common::swap16(pSrc[p]); pDest[p] = Common::swap16(pSrc[p]);
#if defined(HAVE_WX) && HAVE_WX
#if defined(_DEBUG) || defined(DEBUGFAST) #if defined(_DEBUG) || defined(DEBUGFAST)
if(m_frame) m_frame->gLastBlock = blockAddr + p*2 + 2; // save last block location if(m_frame) m_frame->gLastBlock = blockAddr + p*2 + 2; // save last block location
#endif #endif
#endif
} }
blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo; blockAddr = (_pPBs[i].next_pb_hi << 16) | _pPBs[i].next_pb_lo;
count++; count++;

2
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
View File

@ -62,9 +62,11 @@ inline int ReadOutPBsWii(u32 pbs_address, ParamBlockType& _pPBs, int _num)
if(p == 6 || p == 7) pDest[p] = pSrc[p]; // control for the u32 if(p == 6 || p == 7) pDest[p] = pSrc[p]; // control for the u32
else pDest[p] = Common::swap16(pSrc[p]); else pDest[p] = Common::swap16(pSrc[p]);
#if defined(HAVE_WX) && HAVE_WX
#if defined(_DEBUG) || defined(DEBUGFAST) #if defined(_DEBUG) || defined(DEBUGFAST)
if(m_frame) m_frame->gLastBlock = blockAddr + p*2 + 2; // save last block location if(m_frame) m_frame->gLastBlock = blockAddr + p*2 + 2; // save last block location
#endif #endif
#endif
} }
_pPBs[i].mixer_control = Common::swap32(_pPBs[i].mixer_control); _pPBs[i].mixer_control = Common::swap32(_pPBs[i].mixer_control);

6
Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
View File

@ -15,6 +15,8 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include <iostream>
#include "Globals.h" #include "Globals.h"
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd #include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
@ -214,11 +216,11 @@ void DSP_Initialize(DSPInitialize _dspInitialize)
gpName = g_dspInitialize.pName(); // save the game name globally gpName = g_dspInitialize.pName(); // save the game name globally
for (int i = 0; i < gpName.length(); ++i) // and fix it for (int i = 0; i < gpName.length(); ++i) // and fix it
{ {
wprintf("%c", gpName[i]); wprintf(L"%c", gpName[i]);
std::cout << gpName[i]; std::cout << gpName[i];
if (gpName[i] == ':') gpName[i] = ' '; if (gpName[i] == ':') gpName[i] = ' ';
} }
wprintf("\n"); wprintf(L"\n");
#endif #endif
CDSPHandler::CreateInstance(); CDSPHandler::CreateInstance();

2
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -17,6 +17,8 @@
#include "Globals.h" #include "Globals.h"
#include <cstdarg>
#ifdef _WIN32 #ifdef _WIN32
#include "OS/Win32.h" #include "OS/Win32.h"
#endif #endif