diff --git a/common/include/Utilities/wxGuiTools.h b/common/include/Utilities/wxGuiTools.h index 3b09bb2dfe..b334f9a402 100644 --- a/common/include/Utilities/wxGuiTools.h +++ b/common/include/Utilities/wxGuiTools.h @@ -264,7 +264,7 @@ template< typename WinType > void operator+=( wxSizer* target, const pxWindowAndFlags& src ) { if( !pxAssert( target != NULL ) ) return; - target.Add( src.window, src.flags ); + target->Add( src.window, src.flags ); } // ---------------------------------------------------------------------------- diff --git a/common/src/Utilities/wxGuiTools.cpp b/common/src/Utilities/wxGuiTools.cpp index 4348e773bb..3883cb1f5d 100644 --- a/common/src/Utilities/wxGuiTools.cpp +++ b/common/src/Utilities/wxGuiTools.cpp @@ -455,9 +455,9 @@ void pxSetToolTip( wxWindow& wind, const wxString& src ) wxFont pxGetFixedFont( int ptsize, int weight ) { return wxFont( - ptsize, wxMODERN, wxNORMAL, weight, false, + ptsize, wxMODERN, wxNORMAL, weight, false #ifdef __WXMSW__ - L"Lucida Console" // better than courier new (win32 only) + ,L"Lucida Console" // better than courier new (win32 only) #endif ); } diff --git a/pcsx2/SPR.cpp b/pcsx2/SPR.cpp index c1e47ea486..bd11106c64 100644 --- a/pcsx2/SPR.cpp +++ b/pcsx2/SPR.cpp @@ -90,7 +90,6 @@ __forceinline void SPR0chain() spr0->qwc = 0; } - void _SPR0interleave() { int qwc = spr0->qwc; @@ -373,7 +372,7 @@ void _dmaSPR1() // toSPR work function SPR_LOG("spr1 dmaChain %8.8x_%8.8x size=%d, id=%d, addr=%lx", ptag[1]._u32, ptag[0]._u32, spr1->qwc, ptag->ID, spr1->madr); - done = (hwDmacSrcChain(spr1, ptag->ID) == 1); + done = (hwDmacSrcChain(spr1, ptag->ID)); SPR1chain(); //Transfers the data set by the switch if (spr1->chcr.TIE && ptag->IRQ) //Check TIE bit of CHCR and IRQ bit of tag diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 30471edf38..3bd37c096d 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -28,6 +28,10 @@ #include "System/SysThreads.h" #include "GS.h" +#ifdef __LINUX__ +#include +#endif + using namespace x86Emitter; using namespace R5900;