From 3461d9e8b5c3ac4bfaccf636e8f8a9d570c58b39 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 11 Mar 2015 17:37:33 +0000
Subject: [PATCH] From Laurens Voerman, "The current version will not compile
 with SDL version 2, error
 OpenSceneGraph\src\osgPlugins\sdl\JoystickDevice.cpp(42): error C2664: 'const
 char *SDL_JoystickName(SDL_Joystick *)' : cannot convert argument 1 from
 'int' to 'SDL_Joystick *' due to changes in the SDL api.

Tested with Visual Studio Express 2013; SDL 2.0.1"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14777 16af8721-9629-0410-8352-f15c8da7e697
---
 src/osgPlugins/sdl/JoystickDevice.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/osgPlugins/sdl/JoystickDevice.cpp b/src/osgPlugins/sdl/JoystickDevice.cpp
index 307c1e55c..f7ebd8879 100644
--- a/src/osgPlugins/sdl/JoystickDevice.cpp
+++ b/src/osgPlugins/sdl/JoystickDevice.cpp
@@ -39,7 +39,11 @@ JoystickDevice::JoystickDevice()
         std::cout<<"number of joysticks "<<numJoysticks<<std::endl;
         for(int i=0; i<numJoysticks; ++i)
         {
-            std::cout<<"Joystick name '"<<SDL_JoystickName(i)<<"'"<<std::endl;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+            std::cout << "Joystick name '" << SDL_JoystickNameForIndex(i) << "'" << std::endl;
+#else
+            std::cout << "Joystick name '" << SDL_JoystickName(i) << "'" << std::endl;
+#endif
         }
     }