SDL2/SDL1.2 (Linux);

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87020 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 19 insertions, 19 deletions

diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index bb8a48b9..f270ca73 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -5,16 +5,16 @@ lib_LTLIBRARIES = libDFInput.la
 
 libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
 libDFInput_la_LDFLAGS = -module -avoid-version 
-libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
+libDFInput_la_LIBADD = -lpthread -lX11 $(SDL2_LIBS) $(SDL_LIBS)
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
 	$(GTK3_CFLAGS) \
-	-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
+	-I../../include -I../../libpcsxcore $(SDL2_CFLAGS) $(SDL_CFLAGS)
 
 bin_PROGRAMS = cfgDFInput
 cfgDFInput_SOURCES = cfg-gtk.c pad.h
-cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11
+cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL2_LIBS) $(SDL_LIBS) -lX11
 
 glade_DATA = dfinput.ui
 gladedir = $(datadir)/psemu/
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);
diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h
index f362a876..9e72bf88 100755
--- a/plugins/dfinput/pad.h
+++ b/plugins/dfinput/pad.h
@@ -36,7 +36,7 @@ extern "C" {
 
 #include <SDL.h>
 #include <SDL_joystick.h>
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
 #include <SDL_haptic.h>
 #endif
 
@@ -84,7 +84,7 @@ __private_extern__ char* PLUGLOC(char* toloc);
 #define N_(x) (x)
 #endif
 
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
 extern int has_haptic;
 #endif
 
@@ -186,7 +186,7 @@ typedef struct tagPadState {
 	volatile int8_t		MouseAxis[2][2];
 	uint8_t				Vib0, Vib1;
 	volatile uint8_t	VibF[2];
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_Haptic		*haptic;
 #else
 #ifdef __linux__
diff --git a/plugins/dfinput/sdljoy.c b/plugins/dfinput/sdljoy.c
index 7d0dad71..2a763935 100755
--- a/plugins/dfinput/sdljoy.c
+++ b/plugins/dfinput/sdljoy.c
@@ -18,13 +18,13 @@
 
 #include "pad.h"
 
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
 static SDL_HapticEffect haptic_rumbleEffect;
 #endif
 
 void JoyInitHaptic()
 {
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
   uint8_t i;
     //unsigned int haptic_query = 0;
   for (i = 0; i < 2; i++)
@@ -61,7 +61,7 @@ void JoyInitHaptic()
 
 int JoyHapticRumble(int pad, uint32_t low, uint32_t high)
 {
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
   float mag;
 
   if (g.PadState[pad].haptic) {
@@ -99,13 +99,13 @@ void InitSDLJoy() {
 		} else {
 			g.PadState[i].JoyDev = NULL;
 		}
-#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__)
 		g.PadState[i].VibrateDev = -1;
 		g.PadState[i].VibrateEffect = -1;
 #endif
 	}
 
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
   if (has_haptic)
   {
     JoyInitHaptic();
@@ -127,7 +127,7 @@ void DestroySDLJoy() {
 	if (SDL_WasInit(SDL_INIT_JOYSTICK)) {
 		for (i = 0; i < 2; i++) {
 			if (g.PadState[i].JoyDev != NULL) {
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
         if (g.PadState[i].haptic != NULL)
         {
           SDL_HapticClose(g.PadState[i].haptic);