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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desmume/src/wx/PadSimple/PadSimple.cpp
View File

@ -25,7 +25,7 @@
//#include "LogManager.h"
#include "pluginspecs_pad.h"
#include "PadSimple.h"
#include <wx/config.h>
#include <wx/config.h>
//#include "StringUtil.h"
//#include "FileUtil.h"
//#include "ChunkFile.h"
@ -113,7 +113,7 @@ BOOL APIENTRY aMain(HINSTANCE hinstDLL, // DLL module handle
}
#endif
#if 0
#if 0
#if defined(HAVE_WX)
wxWindow* GetParentedWxWindow(HWND Parent)
{
@ -228,7 +228,7 @@ bool IsFocus()
#endif
}
#ifdef _WIN32
#ifdef _WIN32
// Implement circular deadzone
void ScaleStickValues(unsigned char* outx,
unsigned char* outy,
@ -260,7 +260,7 @@ void ScaleStickValues(unsigned char* outx,
*outx = 0x80 + ix;
*outy = 0x80 + iy;
}
#endif
#endif
// for same displacement should be sqrt(2)/2 (in theory)
// 3/4 = 0.75 is a little faster than sqrt(2)/2 = 0.7071...
@ -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)
{
@ -687,7 +689,7 @@ void Initialize(void *init)
#endif
}
#if 0
#if 0
void DoState(unsigned char **ptr, int mode)
{
#ifdef RERECORDING
@ -920,7 +922,7 @@ void LoadConfig()
};
#endif
wxConfigBase *config = wxConfigBase::Get();
wxConfigBase *config = wxConfigBase::Get();
for(int i = 0; i < 4; i++)
{
@ -958,11 +960,11 @@ void LoadConfig()
void SaveConfig()
{
wxConfigBase *config = wxConfigBase::Get();
wxConfigBase *config = wxConfigBase::Get();
for(int i = 0; i < 4; i++)
{
config->SetPath(wxString::Format(_T("/PAD%i"), i+1));
config->SetPath(wxString::Format(_T("/PAD%i"), i+1));
config->Write(_T("UseXPad"), pad[i].bEnableXPad);
config->Write(_T("DisableOnBackground"), pad[i].bDisable);

2
desmume/src/wx/wxMain.cpp
View File

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