diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-29 22:14:32 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-29 22:14:32 +0000 |
| commit | 06f5ec54da4efb1383298da7c2d20805c5304dd1 (patch) | |
| tree | 611d78f0d206b003c464d6151e90a1a12f8d0533 /plugins/dfinput/pad.c | |
| parent | 1fcc3c79767d1cfdaabb14ae40a17399f0163ac6 (diff) | |
| download | pcsxr-06f5ec54da4efb1383298da7c2d20805c5304dd1.tar.gz | |
SDL2/SDL1.2 (Linux);
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87020 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput/pad.c')
| -rwxr-xr-x | plugins/dfinput/pad.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index 9404f574..c0f72657 100755 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -17,13 +17,13 @@ */ #include "pad.h" -#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__) +#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__) #include <linux/input.h> #include <sys/file.h> #include <time.h> #endif -#if SDL_VERSION_ATLEAST(1,3,0) +#if SDL_VERSION_ATLEAST(2,0,0) int has_haptic; #endif @@ -99,7 +99,7 @@ long PADopen(unsigned long *Disp) { return PSE_PAD_ERR_FAILURE; } -#if SDL_VERSION_ATLEAST(1,3,0) +#if SDL_VERSION_ATLEAST(2,0,0) has_haptic = 0; if (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0) has_haptic = 1; @@ -134,7 +134,7 @@ long PADclose(void) { DestroySDLJoy(); DestroyKeyboard(); -#if SDL_VERSION_ATLEAST(1,3,0) +#if SDL_VERSION_ATLEAST(2,0,0) if (SDL_WasInit(SDL_INIT_EVERYTHING & ~(SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK))) { SDL_QuitSubSystem(SDL_INIT_HAPTIC); SDL_QuitSubSystem(SDL_INIT_JOYSTICK); @@ -221,7 +221,7 @@ static uint8_t stdmodel[2][8] = { 0x00} }; -#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__) +#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__) /* lifted from SDL; but it's GPL as well */ /* added ffbit, though */ #define test_bit(nr, addr) \ @@ -473,7 +473,7 @@ unsigned char PADpoll(unsigned char value) { g.PadState[CurPad].VibF[0] = value; if (g.PadState[CurPad].VibF[0] != 0 || g.PadState[CurPad].VibF[1] != 0) { -#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__) +#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__) if (g.PadState[CurPad].VibrateDev == -1 && g.PadState[CurPad].JoyDev != NULL) { linux_set_vibrate(CurPad); @@ -496,7 +496,7 @@ unsigned char PADpoll(unsigned char value) { g.PadState[CurPad].VibF[1] = value; if (g.PadState[CurPad].VibF[0] != 0 || g.PadState[CurPad].VibF[1] != 0) { -#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__) +#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__) if (g.PadState[CurPad].VibrateDev == -1 && g.PadState[CurPad].JoyDev != NULL) { linux_set_vibrate(CurPad); |