diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 23:36:00 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-14 23:36:00 -0500 |
| commit | 7772f0d071cd8f1c6b44036207b4e6f9da4d9bf7 (patch) | |
| tree | 6dbe1cff255abe6e35f51910df73daf5eecbec88 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| parent | 8a9fcd3014a4aee23b6fb7008a02679f8bf96200 (diff) | |
| parent | 44bbb54a62a58be4ad39caf6ba55ff98244223d5 (diff) | |
Merge branch 'Android-trash' since it is no longer quite so trashy.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h index b846bb56e8..59bc49ac51 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h @@ -29,7 +29,10 @@ #if defined(__APPLE__) #define CIFACE_USE_OSX #endif - +#ifdef ANDROID + #define CIFACE_USE_ANDROID +#endif + // idk in case i wanted to change it to double or somethin, idk what's best typedef float ControlState; |