mirror of https://github.com/PCSX2/pcsx2.git
Fix up Linux again.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2255 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
474a404dfd
commit
bedb21f3d6
|
@ -18,7 +18,7 @@
|
||||||
#include "Threading.h"
|
#include "Threading.h"
|
||||||
#include "x86emitter/tools.h"
|
#include "x86emitter/tools.h"
|
||||||
|
|
||||||
#if !defined(__LINUX__) || !defined(__WXMAC__)
|
#if !defined(__LINUX__) && !defined(__WXMAC__)
|
||||||
|
|
||||||
# pragma message( "LnxThreads.cpp should only be compiled by projects or makefiles targeted at Linux/Mac distros.")
|
# pragma message( "LnxThreads.cpp should only be compiled by projects or makefiles targeted at Linux/Mac distros.")
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ void pxYieldToMain()
|
||||||
|
|
||||||
// (FIXME : Find a more correct implementation for this?)
|
// (FIXME : Find a more correct implementation for this?)
|
||||||
|
|
||||||
Sleep( 2 );
|
Threading::Sleep( 2 );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -108,7 +108,7 @@ void wxDialogWithHelpers::AddOkCancel( wxSizer &sizer, bool hasApply )
|
||||||
{
|
{
|
||||||
SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
|
SetExtraStyle( wxDIALOG_EX_CONTEXTHELP );
|
||||||
#ifndef __WXMSW__
|
#ifndef __WXMSW__
|
||||||
m_extraButtonSizer += new wxContextHelpButton(this);
|
s_buttons += new wxContextHelpButton(this);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue