From 094e815d0873f89f40cbd8bb70fa1700c4f07ab1 Mon Sep 17 00:00:00 2001 From: philipoe Date: Wed, 26 Nov 2014 17:57:45 +0100 Subject: [PATCH] Modified .gitignore to re-track changes in user_config.pri, which is needed because we want to include the asluav mavlink message set by default --- .gitignore | 2 +- user_config.pri | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 user_config.pri diff --git a/.gitignore b/.gitignore index 75fce565435..3a3e48796a7 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,7 @@ deploy/mac deploy/linux deploy/qgroundcontrol* controller_log* -user_config.pri +#user_config.pri #Commented by ASL(PhilippOe) *.app *.ncb *.vcproj diff --git a/user_config.pri b/user_config.pri new file mode 100644 index 00000000000..30a8c45fa10 --- /dev/null +++ b/user_config.pri @@ -0,0 +1,36 @@ +#------------------------------------------------- +# +# QGroundControl - Micro Air Vehicle Groundstation +# +# Please see our website at +# +# Author: +# Lorenz Meier +# +# (c) 2009-2010 PIXHAWK Team +# +# This file is part of the mav groundstation project +# QGroundControl is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# QGroundControl is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with QGroundControl. If not, see . +# +#------------------------------------------------- + +# Specify the MAVLink dialect to compile support for here. This variable is processed +# by QGCExternalLibs.pri, which handles MAVLink configuration. The dialect should +# correspond to an include folder under `libs/mavlink/include/mavlink/v1.0`. You can +# also force a build to use only common mavlink message by setting MAVLINK_CONF to empty here. +MAVLINK_CONF = ASLUAV + +# Override compilation of QGroundControl's features in your build. This overrides the default +# options for QGroundControl. To see what those are, refer to README.md. +# This should be a space-separated list of the constants specified in README.md. +# Uncomment the following line and replace DISABLE_XBEE with any features to override. +#DEFINES = DISABLE_XBEE