Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7b9d3f1f
Commit
7b9d3f1f
authored
Nov 30, 2014
by
Helio Chissini de Castro
Browse files
- Use pkgconfig on linux to avoid break build on undefineds
parent
a494d27b
Changes
2
Hide whitespace changes
Inline
Side-by-side
QGCExternalLibs.pri
View file @
7b9d3f1f
...
...
@@ -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 \
...
...
qgroundcontrol.pro
View file @
7b9d3f1f
...
...
@@ -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"
)
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment