Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1d3a34b7
Unverified
Commit
1d3a34b7
authored
Oct 08, 2019
by
Don Gagne
Committed by
GitHub
Oct 08, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7890 from DonLakeFlyer/AndroidSDL
Remove SDL from android image
parents
5c09454c
7c195e6d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
.travis.yml
.travis.yml
+5
-1
No files found.
.travis.yml
View file @
1d3a34b7
...
...
@@ -64,7 +64,6 @@ addons:
-
libgstreamer-plugins-base1.0-dev
-
libgstreamer1.0-0:amd64
-
libgstreamer1.0-dev
-
libsdl2-dev
-
libudev-dev
-
wget
...
...
@@ -81,6 +80,11 @@ before_install:
export JOBS=$((`sysctl -n hw.ncpu`+1));
fi
# Linux needs sdl2 but not android
-
if [ "${SPEC}" = "linux-g++-64" ]; then
sudo apt-get install -y libsdl2-dev;
fi
install
:
# linux dependencies: qt
-
if [ "${SPEC}" = "linux-g++-64" ]; then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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