mirror of https://github.com/PCSX2/pcsx2.git
The usual Linux stuff.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2341 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
fa95c0f191
commit
9a972ccc02
|
@ -264,7 +264,7 @@ template< typename WinType >
|
|||
void operator+=( wxSizer* target, const pxWindowAndFlags<WinType>& src )
|
||||
{
|
||||
if( !pxAssert( target != NULL ) ) return;
|
||||
target.Add( src.window, src.flags );
|
||||
target->Add( src.window, src.flags );
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
|
@ -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
|
||||
);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -28,6 +28,10 @@
|
|||
#include "System/SysThreads.h"
|
||||
#include "GS.h"
|
||||
|
||||
#ifdef __LINUX__
|
||||
#include <csetjmp>
|
||||
#endif
|
||||
|
||||
using namespace x86Emitter;
|
||||
using namespace R5900;
|
||||
|
||||
|
|
Loading…
Reference in New Issue