piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix njoy build for non win32 os, and small osx64 build fix

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1965 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2009-01-20 20:21:05 +00:00
parent e6d78d3447
commit 8f2d1136a7
7 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -179,9 +179,6 @@ void DllConfig(HWND _hParent)
#elif defined(HAVE_WX) && HAVE_WX
ConfigDialog frame(NULL);
frame.ShowModal();
#elif defined(HAVE_COCOA) && HAVE_COCOA
ConfigDialog frame(NULL);
frame.ShowModal();
#endif
SaveConfig();
}
@ -511,10 +508,10 @@ void cocoa_Read(int _numPAD, SPADStatus* _pPADStatus)
//printf("error prox client\n");
}
int cocoaKey = (int)[proxy keyCode];
long cocoaKey = (long)[proxy keyCode];
int i;
if ((int)[proxy type] == 10)
if ((long)[proxy type] == 10)
{
for (i = 0; i < NUMCONTROLS; i++) {
if (cocoaKey == pad[_numPAD].keyForControl[i]) {