SDL2: Library project config for Windows build.

QGCExternalLibs.pri

@@ -181,7 +181,7 @@ MacBuild {
         $$BASEDIR/libs/lib/sdl2/msvc/include \
 
     LIBS += \
-        -L$$BASEDIR/libs/lib/sdl2/msvc/lib \
+        -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86 \
         -lSDL2main \
         -lSDL2
 }

QGCSetup.pri

@@ -62,7 +62,7 @@ WindowsBuild {
     DebugBuild: DLL_QT_DEBUGCHAR = "d"
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
-        $$BASEDIR\\libs\\lib\\sdl2\\win32\\SDL2.dll \
+        $$BASEDIR\\libs\\lib\\sdl2\\msvc\\lib\\x86\\SDL2.dll \
         $$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
         $$BASEDIR\\deploy\\libeay32.dll
 

src/Joystick/JoystickSDL.cc

@@ -48,7 +48,7 @@ QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicl
 
             SDL_JoystickClose(sdlJoystick);
 
-            qCDebug(JoystickLog) << "\t" << name << "axes:" << axisCount << "buttons:" << buttonCount << "hats:" << hatCount;
+            qCDebug(JoystickLog) << "\t" << name << "axes:" << axisCount << "buttons:" << buttonCount << "hats:" << hatCount << "isGC:" << isGameController;
             ret[name] = new JoystickSDL(name, axisCount, buttonCount, hatCount, i, isGameController, _multiVehicleManager);
         } else {
             qCDebug(JoystickLog) << "\tSkipping duplicate" << name;

src/Joystick/JoystickSDL.h

@@ -5,12 +5,7 @@
 #include "Vehicle.h"
 #include "MultiVehicleManager.h"
 
-#ifdef Q_OS_MAC
-    #include <SDL.h>
-#else
-    #include <SDL/SDL.h>
-#endif
-
+#include <SDL.h>
 
 class JoystickSDL : public Joystick
 {