diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-04-25 14:01:07 +0200 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-04-25 14:05:54 +0200 |
| commit | 5e6b712651dc042b06ce59bcfb4becda5ee15022 (patch) | |
| tree | c82731464d76517cce5ffb6d7e9764c47a433804 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h | |
| parent | eef95fa4c5919bf93335e10dd61cd5a9fd6a5f6d (diff) | |
| parent | d18b71ccf91c9578236b44ae26e8bc35314cc180 (diff) | |
Merge 'master' into shader-uids-awesome.
Conflicts:
Source/Core/VideoCommon/Src/BPMemory.h
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.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 |