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

The usual Linux stuff. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2341 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-12-14 13:31:50 +00:00
parent fa95c0f191
commit 9a972ccc02
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/Utilities/wxGuiTools.h
View File

@ -264,7 +264,7 @@ template< typename WinType >
void operator+=( wxSizer* target, const pxWindowAndFlags<WinType>& src ) void operator+=( wxSizer* target, const pxWindowAndFlags<WinType>& src )
{ {
if( !pxAssert( target != NULL ) ) return; if( !pxAssert( target != NULL ) ) return;
target.Add( src.window, src.flags ); target->Add( src.window, src.flags );
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
common/src/Utilities/wxGuiTools.cpp
View File

@ -455,9 +455,9 @@ void pxSetToolTip( wxWindow& wind, const wxString& src )
wxFont pxGetFixedFont( int ptsize, int weight ) wxFont pxGetFixedFont( int ptsize, int weight )
{ {
return wxFont( return wxFont(
ptsize, wxMODERN, wxNORMAL, weight, false, ptsize, wxMODERN, wxNORMAL, weight, false
#ifdef __WXMSW__ #ifdef __WXMSW__
L"Lucida Console" // better than courier new (win32 only) ,L"Lucida Console" // better than courier new (win32 only)
#endif #endif
); );
} }

3
pcsx2/SPR.cpp
View File

@ -90,7 +90,6 @@ __forceinline void SPR0chain()
spr0->qwc = 0; spr0->qwc = 0;
} }
void _SPR0interleave() void _SPR0interleave()
{ {
int qwc = spr0->qwc; 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", 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); 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 SPR1chain(); //Transfers the data set by the switch
if (spr1->chcr.TIE && ptag->IRQ) //Check TIE bit of CHCR and IRQ bit of tag if (spr1->chcr.TIE && ptag->IRQ) //Check TIE bit of CHCR and IRQ bit of tag

4
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -28,6 +28,10 @@
#include "System/SysThreads.h" #include "System/SysThreads.h"
#include "GS.h" #include "GS.h"
#ifdef __LINUX__
#include <csetjmp>
#endif
using namespace x86Emitter; using namespace x86Emitter;
using namespace R5900; using namespace R5900;