From b4cadf4f7881914228b1b364ed8b84f1128c939c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 27 Feb 2014 18:12:07 -0800 Subject: [PATCH] Readme Update --- README.md | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1b14c1e15..9b3e0da88 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,8 @@ To build on Mac OSX (10.6 or later): ### Install QT - - - -1. Download Qt 4.8+ from -2. Double click the package installer and follow instructions: +1. Download Qt 4.8+ from: +2. Double click the package installer and follow instructions. ### Build QGroundControl - - - @@ -88,7 +88,7 @@ To build on Mac OSX (10.6 or later): To build on Linux: - - - 1. Install base dependencies (QT + phonon/webkit, SDL) - * For Ubuntu: `sudo apt-get install libqt4-dev libphonon-dev libphonon4 phonon-backend-gstreamer qtcreator libsdl1.2-dev build-essential` + * For Ubuntu: `sudo apt-get install libqt4-dev libphonon-dev libphonon4 phonon-backend-gstreamer qtcreator libsdl1.2-dev build-essential libudev-dev` * For Fedora: `sudo yum install qt qt-creator qt-webkit-devel SDL-devel SDL-static systemd-devel` 2. **[OPTIONAL]** Install additional libraries @@ -124,25 +124,22 @@ To build on Linux: # Build on Windows - - - -__GNU GCC / MINGW IS UNTESTED, COULD WORK WITH -VISUAL STUDIO 2008 / 2010 EXPRESS EDITION (FREE!)__ +Steps for Visual Studio 2010: -Steps for Visual Studio 2008 / 2010: +1. Download and install Visual Studio 2010 Express Edition (free) from here: . Make sure to install VS 2010 SP1 as well to fix a linking error. Download from here: . -Windows XP/7: - -1. Download and install the Qt libraries for Windows from https://qt.nokia.com/downloads/ (the Visual Studio 2008 or 2010 version as appropriate) - -2. Download and install Visual Studio 2008 or 2010 Express Edition (free) from https://www.microsoft.com/visualstudio. If using Visual Studio 2010, make sure you are running at least SP1. There is a linking error you'll encounter otherwise that will prevent compilation. +2. Download and install the Qt libraries for Windows (VS 2010 version) from here: 3. Go to the QGroundControl folder and then to thirdParty/libxbee and build it following the instructions in win32.README 4. Open the Qt Command Prompt program (should be in the Start Menu), navigate to the source folder of QGroundControl and create the Visual Studio project by typing `qmake -tp vc qgroundcontrol.pro` -5. Now start Visual Studio and load the qgroundcontrol.vcproj if using Visual Studio 2008 or qgroundcontrol.vcxproj if using Visual Studio 2010 +5. Now start Visual Studio 2010 and load qgroundcontrol.vcxproj. 6. Compile and edit in Visual Studio. If you need to add new files, add them to qgroundcontrol.pro and re-run `qmake -tp vc qgroundcontrol.pro` +7. If you already have VS 2008 that works as well. Download the appropriate Qt from here: . And use qgroundcontrol.vcproj instead. + ## Repository Layout The following describes the directory structure and important files in the QGroundControl repository -- 2.22.0