Commit 8db1e34d authored by LM's avatar LM

Merge branch 'v10release' of github.com:pixhawk/qgroundcontrol into v10release

parents f7cef6a2 e6db872c
...@@ -33,10 +33,10 @@ BASEDIR = $$IN_PWD ...@@ -33,10 +33,10 @@ BASEDIR = $$IN_PWD
TARGETDIR = $$OUT_PWD TARGETDIR = $$OUT_PWD
BUILDDIR = $$TARGETDIR/build BUILDDIR = $$TARGETDIR/build
LANGUAGE = C++ LANGUAGE = C++
OBJECTS_DIR = $$BUILDDIR/obj #OBJECTS_DIR = $$BUILDDIR/obj
MOC_DIR = $$BUILDDIR/moc #MOC_DIR = $$BUILDDIR/moc
UI_HEADERS_DIR = $$BUILDDIR/ui #UI_HEADERS_DIR = $$BUILDDIR/ui
RCC_DIR = $$BUILDDIR/rcc #RCC_DIR = $$BUILDDIR/rcc
MAVLINK_CONF = "" MAVLINK_CONF = ""
DEFINES += MAVLINK_NO_DATA DEFINES += MAVLINK_NO_DATA
......
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