temp fixes for compiling wx on osx

This commit is contained in:
wntrmute 2010-12-19 11:11:03 +00:00
parent d37ac82039
commit 95c40ea60a
2 changed files with 11 additions and 9 deletions

View File

@ -439,6 +439,7 @@ bool XInput_Read(int XPadPlayer, SPADStatus* _pPADStatus)
// The graphics plugin in the PCSX2 design leaves a lot of the window processing to the pad plugin, weirdly enough.
static void X11_Read(int _numPAD, SPADStatus* _pPADStatus)
{
#ifndef __APPLE__
// Do all the stuff we need to do once per frame here
if (_numPAD != 0)
return;
@ -495,6 +496,7 @@ static void X11_Read(int _numPAD, SPADStatus* _pPADStatus)
break;
}
}
#endif // __APPLE__
#elif defined(HAVE_COCOA) && HAVE_COCOA
void cocoa_Read(int _numPAD, SPADStatus* _pPADStatus)
{

View File

@ -48,7 +48,7 @@ SoundInterface_struct *SNDCoreList[] = {
GPU3DInterface *core3DList[] = {
&gpu3DRasterize,
#ifndef WIN32
#if !defined(WIN32) && !defined(__APPLE__)
&gpu3Dgl,
#endif
&gpu3DNull,