Commit 699b36ce authored by Lorenz Meier's avatar Lorenz Meier

Merge pull request #215 from geeksville/master

Minor fixes to fix build on Ubuntu
parents 917d0e50 6177774b
...@@ -49,13 +49,14 @@ To build on Linux: ...@@ -49,13 +49,14 @@ To build on Linux:
sudo apt-get install phonon libqt4-dev \ sudo apt-get install phonon libqt4-dev \
libphonon-dev libphonon4 phonon-backend-gstreamer \ libphonon-dev libphonon4 phonon-backend-gstreamer \
qtcreator libsdl1.2-dev libflite1 flite1-dev build-essential qtcreator libsdl1.2-dev libflite1 flite1-dev build-essential \
libopenscenegraph-dev
cd directory cd directory
git clone https://github.com/mavlink/qgroundcontrol.git git clone https://github.com/mavlink/qgroundcontrol.git
go to thirdParty -> libxbee go to libs/thirdParty -> libxbee
Create Library -> Readme file in folder Create Library -> Readme file in folder
......
...@@ -657,3 +657,5 @@ win32-msvc2008|win32-msvc2010 { ...@@ -657,3 +657,5 @@ win32-msvc2008|win32-msvc2010 {
INCLUDEPATH += libs/thirdParty/3DMouse/win INCLUDEPATH += libs/thirdParty/3DMouse/win
DEFINES += MOUSE_ENABLED_WIN DEFINES += MOUSE_ENABLED_WIN
} }
unix:!macx:!symbian: LIBS += -losg
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