1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00

Do the includes a slightly different way that negates the need for the install directory.

Is this acceptable or a mistake?


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1265 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
dankers 2010-08-10 22:05:32 +00:00 committed by dankers
parent b1042ecb11
commit 3ec40c17dc
2 changed files with 27 additions and 27 deletions

View File

@ -1,21 +1,21 @@
TEMPLATE = lib
TARGET = ModelViewGadget
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/glc_lib/glc_lib.pri)
include(modelview_dependencies.pri)
INCLUDEPATH += ../../libs/glc_lib/install/include/GLC_lib
HEADERS += modelviewplugin.h \
modelviewgadgetconfiguration.h \
modelviewgadget.h \
modelviewgadgetwidget.h \
modelviewgadgetfactory.h \
modelviewgadgetoptionspage.h
SOURCES += modelviewplugin.cpp \
modelviewgadgetconfiguration.cpp \
modelviewgadget.cpp \
modelviewgadgetfactory.cpp \
modelviewgadgetwidget.cpp \
modelviewgadgetoptionspage.cpp
OTHER_FILES += ModelViewGadget.pluginspec
FORMS += modelviewoptionspage.ui
TEMPLATE = lib
TARGET = ModelViewGadget
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/glc_lib/glc_lib.pri)
include(modelview_dependencies.pri)
INCLUDEPATH += ../../libs/glc_lib
HEADERS += modelviewplugin.h \
modelviewgadgetconfiguration.h \
modelviewgadget.h \
modelviewgadgetwidget.h \
modelviewgadgetfactory.h \
modelviewgadgetoptionspage.h
SOURCES += modelviewplugin.cpp \
modelviewgadgetconfiguration.cpp \
modelviewgadget.cpp \
modelviewgadgetfactory.cpp \
modelviewgadgetwidget.cpp \
modelviewgadgetoptionspage.cpp
OTHER_FILES += ModelViewGadget.pluginspec
FORMS += modelviewoptionspage.ui

View File

@ -31,12 +31,12 @@
#include <QtOpenGL/QGLWidget>
#include <QTimer>
#include <GLC_Factory>
#include <GLC_Viewport>
#include <GLC_MoverController>
#include <GLC_Light>
#include <GLC_World>
#include <GLC_Exception>
#include "GLC_Factory.h"
#include "viewport/GLC_Viewport.h"
#include "viewport/GLC_MoverController.h"
#include "shading/GLC_Light.h"
#include "sceneGraph/GLC_World.h"
#include "GLC_Exception.h"
#include "uavobjects/uavobjectmanager.h"
#include "uavobjects/attitudeactual.h"