Browse Source

Merge pull request #1031 from heliocastro/pkgconfig-sdl

- Use pkgconfig on linux to avoid break build on undefineds
QGC4.4
Lorenz Meier 10 years ago
parent
commit
5ad977ae54
  1. 4
      QGCExternalLibs.pri
  2. 2
      qgroundcontrol.pro

4
QGCExternalLibs.pri

@ -376,9 +376,7 @@ MacBuild { @@ -376,9 +376,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 \

2
qgroundcontrol.pro

@ -30,7 +30,7 @@ message(Qt version $$[QT_VERSION]) @@ -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")
}

Loading…
Cancel
Save