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

Fix OS X build.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6951 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-28 21:27:49 +00:00
parent f283041970
commit 08b923a163
12 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
View File

@ -470,7 +470,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
else if ('`' == c)
{
// different device
if (false == std::getline(ss, dev_str, '`'))
if (false == /*XXX*/(bool)std::getline(ss, dev_str, '`'))
break;
}
else

4
Source/Core/InputCommon/Src/ControllerInterface/OSX/NamedKeys.h
View File

@ -166,9 +166,9 @@
{ kHIDUsage_KeyboardLeftControl, "Left Control" },
{ kHIDUsage_KeyboardLeftShift, "Left Shift" },
{ kHIDUsage_KeyboardLeftAlt, "Left Alt" },
{ kHIDUsage_KeyboardLeftGUI, "Left GUI" },
{ kHIDUsage_KeyboardLeftGUI, "Left Command" },
{ kHIDUsage_KeyboardRightControl, "Right Control" },
{ kHIDUsage_KeyboardRightShift, "Right Shift" },
{ kHIDUsage_KeyboardRightAlt, "Right Alt" },
{ kHIDUsage_KeyboardRightGUI, "Right GUI" },
{ kHIDUsage_KeyboardRightGUI, "Right Command" },
/* 0x4E - 0xFFFF Reserved */