diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-02-15 19:25:23 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-02-15 19:25:23 +0000 |
| commit | b53c30ad254188c3aa44a2c0584770cc34c65976 (patch) | |
| tree | e31a0af01decb00775dab8f82faed75772ea674f /Source/Core/InputCommon/Src/Configuration.cpp | |
| parent | 9041485a73fa63f3ec3c07f27c8e65c6a49e488c (diff) | |
Emulated Wiimote and SimplePad: Build fixes for Linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2264 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/Configuration.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/Configuration.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/Configuration.cpp b/Source/Core/InputCommon/Src/Configuration.cpp index 20f5bae2af..b368a79f87 100644 --- a/Source/Core/InputCommon/Src/Configuration.cpp +++ b/Source/Core/InputCommon/Src/Configuration.cpp @@ -33,8 +33,8 @@ //////////////////////////////////////////////////////////////////////////////////////////
// Include
// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ
-#if defined HAVE_WX && HAVE_WX - #include <wx/wx.h> +#if defined HAVE_WX && HAVE_WX
+ #include <wx/wx.h>
#endif
#include "SDL.h" // Local
@@ -214,6 +214,7 @@ std::vector<int> Square2Circle(int _x, int _y, int _pad, std::string SDiagonal, #ifdef _WIN32
std::string VKToString(int keycode)
{
+#ifdef _WIN32
// Default value
char KeyStr[64] = {0};
GetKeyNameText(MapVirtualKey(keycode, MAPVK_VK_TO_VSC) << 16, KeyStr, 64);
@@ -240,6 +241,10 @@ std::string VKToString(int keycode) default: return KeyString;
}
+#else
+ // An equivalent name translation can probably be used on other systems to?
+ return "";
+#endif
}
#endif
/////////////////////////////////////////////////////////////////////
|