Merge pull request #215 from geeksville/master

Minor fixes to fix build on Ubuntu
12 years ago · 699b36cea8
2 changed files with 5 additions and 2 deletions
--- a/5
+++ b/5
@ -49,13 +49,14 @@ To build on Linux:
				@@ -49,13 +49,14 @@ To build on Linux:

 sudo apt-get install phonon libqt4-dev \
 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

 git clone https://github.com/mavlink/qgroundcontrol.git

-go to thirdParty -> libxbee 
+go to libs/thirdParty -> libxbee 

 Create Library -> Readme file in folder

--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -657,3 +657,5 @@ win32-msvc2008|win32-msvc2010 {
				@@ -657,3 +657,5 @@ win32-msvc2008|win32-msvc2010 {
    INCLUDEPATH += libs/thirdParty/3DMouse/win
    DEFINES += MOUSE_ENABLED_WIN
 }
+
+unix:!macx:!symbian: LIBS += -losg