Skip to content

Q
qgroundcontrol
Commit 7b9d3f1f authored by Helio Chissini de Castro's avatar Helio Chissini de Castro
Browse files
Options

- Use pkgconfig on linux to avoid break build on undefineds

parent a494d27b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
QGCExternalLibs.pri
View file @ 7b9d3f1f
...@@ -366,9 +366,7 @@ MacBuild { ...@@ -366,9 +366,7 @@ MacBuild {
-F$$BASEDIR/libs/lib/Frameworks \ -F$$BASEDIR/libs/lib/Frameworks \
-framework SDL -framework SDL
} else:LinuxBuild { } else:LinuxBuild {
LIBS += \ PKGCONFIG = sdl
-lSDL \
-lSDLmain
} else:WindowsBuild { } else:WindowsBuild {
INCLUDEPATH += \ INCLUDEPATH += \
$$BASEDIR/libs/lib/sdl/msvc/include \ $$BASEDIR/libs/lib/sdl/msvc/include \
......
qgroundcontrol.pro
View file @ 7b9d3f1f
...@@ -30,7 +30,7 @@ message(Qt version $$[QT_VERSION]) ...@@ -30,7 +30,7 @@ message(Qt version $$[QT_VERSION])
linux { linux {
linux-g++ | linux-g++-64 { linux-g++ | linux-g++-64 {
message("Linux build") message("Linux build")
CONFIG += LinuxBuild CONFIG += LinuxBuild link_pkgconfig
} else { } else {
error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported") error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment