From 7b9d3f1fa9cb36c64d23213910f76e71eca16273 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 30 Nov 2014 14:57:11 -0200 Subject: [PATCH] - Use pkgconfig on linux to avoid break build on undefineds --- QGCExternalLibs.pri | 4 +--- qgroundcontrol.pro | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 8b7edd40f..15a74c099 100644 --- 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 \ diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index f5102c584..96edf327f 100644 --- 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") } -- 2.22.0