diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-04-24 00:48:00 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-04-24 00:48:00 +1200 |
| commit | 934e150596c30d7d1f74c208f90d741b23456e21 (patch) | |
| tree | e77b95dd17aeb3cd2b6118961f4b2a15f0cc956f /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| parent | b652f1974f27b181f206d264831fc4685c984e1c (diff) | |
| parent | 9a50d055a1101ae5f2143c83889b51916cb16fbf (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/ConfigManager.cpp
Source/Core/Core/Src/HLE/HLE_OS.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index b846bb56e8..8c1a044860 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -29,14 +29,17 @@ #if defined(__APPLE__) #define CIFACE_USE_OSX #endif - -// idk in case i wanted to change it to double or somethin, idk what's best +#ifdef ANDROID + #define CIFACE_USE_ANDROID +#endif + +// idk in case I wanted to change it to double or something, idk what's best typedef float ControlState; // // ControllerInterface // -// some crazy shit i made to control different device inputs and outputs +// some crazy shit I made to control different device inputs and outputs // from lots of different sources, hopefully more easily // class ControllerInterface @@ -186,7 +189,7 @@ public: // // these are what you create to actually use the inputs, InputReference or OutputReference // - // after being binded to devices and controls with ControllerInterface::UpdateReference, + // after being bound to devices and controls with ControllerInterface::UpdateReference, // each one can link to multiple devices and controls // when you change a ControlReference's expression, // you must use ControllerInterface::UpdateReference on it to rebind controls |