- Use pkgconfig on linux to avoid break build on undefineds

7b9d3f1f · Helio Chissini de Castro · a494d27b · 7b9d3f1f · 7b9d3f1f
Commit 7b9d3f1f authored Nov 30, 2014 by Helio Chissini de Castro
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

QGCExternalLibs.pri QGCExternalLibs.pri +1 -3

qgroundcontrol.pro qgroundcontrol.pro +1 -1

No files found.
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -366,9 +366,7 @@ MacBuild {
        -F$$BASEDIR/libs/lib/Frameworks \
        -framework SDL
 } else:LinuxBuild {
-	LIBS += \
-		-lSDL \
-		-lSDLmain
+	PKGCONFIG = sdl
 } else:WindowsBuild {
 	INCLUDEPATH += \
        $$BASEDIR/libs/lib/sdl/msvc/include \

--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -30,7 +30,7 @@ message(Qt version $$[QT_VERSION])
 linux {
    linux-g++ | linux-g++-64 {
        message("Linux build")
-        CONFIG += LinuxBuild
+        CONFIG += LinuxBuild link_pkgconfig
    } else {
        error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
    }