From b468fd50bd42cd07f567cd5a6a6ffda07387abb7 Mon Sep 17 00:00:00 2001 From: oberion Date: Mon, 12 Sep 2011 16:20:28 +0200 Subject: [PATCH] Changed project file. Project can be included in VC with QTaddin such that moccing is not always performed Still some Bugs. In VS2010 the RCC_DIR preprocessor define path is not used. --- qgroundcontrol.pro | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 55733b9..fb5e8a9 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -19,6 +19,8 @@ # Qt configuration +CONFIG += qt \ + thread QT += network \ opengl \ svg \ @@ -29,16 +31,24 @@ QT += network \ TEMPLATE = app TARGET = qgroundcontrol -BASEDIR = $$IN_PWD -TARGETDIR = $$OUT_PWD -BUILDDIR = $$TARGETDIR/build +BASEDIR = $${IN_PWD} +TARGETDIR = $${OUT_PWD} +BUILDDIR = $${TARGETDIR}/build LANGUAGE = C++ -OBJECTS_DIR = $$BUILDDIR/obj -MOC_DIR = $$BUILDDIR/moc -UI_HEADERS_DIR = $$BUILDDIR/ui -RCC_DIR = $$BUILDDIR/rcc +OBJECTS_DIR = $${BUILDDIR}/obj +MOC_DIR = $${BUILDDIR}/moc +UI_DIR = $${BUILDDIR}/ui +RCC_DIR = $${BUILDDIR}/rcc MAVLINK_CONF = "" +QMAKE_INCDIR_QT = $$(QTDIR)/include +QMAKE_LIBDIR_QT = $$(QTDIR)/lib +QMAKE_UIC = "$$(QTDIR)/bin/uic.exe" +QMAKE_MOC = "$$(QTDIR)/bin/moc.exe" +QMAKE_RCC = "$$(QTDIR)/bin/rcc.exe" +QMAKE_QMAKE = "$$(QTDIR)/bin/qmake.exe" + + ################################################################# # EXTERNAL LIBRARY CONFIGURATION