Merge pull request mavlink#4110 from bluerobotics/sdl2

Update to SDL2 for Joystick Handling
dahmanmed · Oct 10, 2016 · 24596a5 · 24596a5
2 parents 722a7b9 + 1e920e3
commit 24596a5
Show file tree

Hide file tree

Showing 514 changed files with 68,132 additions and 101,892 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,7 @@ addons:
     - libgstreamer-plugins-base1.0-dev
     - libgstreamer1.0-0:amd64
     - libgstreamer1.0-dev
-    - libsdl1.2-dev
+    - libsdl2-dev
     - libudev-dev
     - wget
 

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
@@ -169,21 +169,21 @@ contains(DEFINES, DISABLE_RTLAB) {
 #
 MacBuild {
     INCLUDEPATH += \
-        $$BASEDIR/libs/lib/Frameworks/SDL.framework/Headers
+        $$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers
 
     LIBS += \
         -F$$BASEDIR/libs/lib/Frameworks \
-        -framework SDL
+        -framework SDL2
 } else:LinuxBuild {
-    PKGCONFIG = sdl
+    PKGCONFIG = sdl2
 } else:WindowsBuild {
     INCLUDEPATH += \
-        $$BASEDIR/libs/lib/sdl/msvc/include \
+        $$BASEDIR/libs/lib/sdl2/msvc/include \
 
     LIBS += \
-        -L$$BASEDIR/libs/lib/sdl/msvc/lib \
-        -lSDLmain \
-        -lSDL
+        -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x86 \
+        -lSDL2main \
+        -lSDL2
 }
 
 ##

diff --git a/QGCSetup.pri b/QGCSetup.pri
@@ -49,8 +49,8 @@ iOSBuild | MacBuild {
 MacBuild {
     # Copy non-standard frameworks into app package
     QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
-    # SDL Framework
-    QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
+    # SDL2 Framework
+    QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
 }
 
 WindowsBuild {
@@ -62,7 +62,7 @@ WindowsBuild {
     DebugBuild: DLL_QT_DEBUGCHAR = "d"
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
-        $$BASEDIR\\libs\\lib\\sdl\\win32\\SDL.dll \
+        $$BASEDIR\\libs\\lib\\sdl2\\msvc\\lib\\x86\\SDL2.dll \
         $$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
         $$BASEDIR\\deploy\\libeay32.dll
 

diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ You need to install Qt as described below instead of using pre-built packages fr
     * Windows: Default installer not quite correct, use [this](http://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-windows-x86-msvc2013-5.5.1.exe) instead
 
 ###### Install additional packages:
-* Ubuntu: sudo apt-get install espeak libespeak-dev libudev-dev libsdl1.2-dev
-* Fedora: sudo dnf install espeak espeak-devel SDL-devel SDL-static systemd-devel
+* Ubuntu: sudo apt-get install espeak libespeak-dev libudev-dev libsdl2-dev
+* Fedora: sudo dnf install espeak espeak-devel SDL2-devel SDL2 systemd-devel
 * Arch Linux: pacman -Sy espeak
 * Windows: [USB Driver](http://www.pixhawk.org/firmware/downloads) to connect to Pixhawk/PX4Flow/3DR Radio
 * Android: [Qt Android Setup](http://doc.qt.io/qt-5/androidgs.html)

diff --git a/libs/lib/Frameworks/SDL.framework/SDL b/libs/lib/Frameworks/SDL.framework/SDL
diff --git a/libs/lib/Frameworks/SDL.framework/Versions/A/Headers/SDL.h b/libs/lib/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
diff --git a/libs/lib/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h b/libs/lib/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h