rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-08 00:53:48 +02:00
Code Issues Releases Activity

*Corrected plugin lib dependencies for Vassilis

Browse Source 
*Corrected some cross-platform issues

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@279 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
julien 2010-03-10 21:09:04 +00:00 committed by julien
parent 964c1e5983
commit ac93d532b7
11 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/src/plugins/uavobjects/uavobjects.pluginspec → ground/src/plugins/uavobjects/UAVObjects.pluginspec
View File

@ -1,10 +1,10 @@
<plugin name="UAVObjects" version="0.0.1" compatVersion="1.1"> <plugin name="UAVObjects" version="0.0.1" compatVersion="0.0.1">
<vendor>The OpenPilot Project</vendor> <vendor>The OpenPilot Project</vendor>
<copyright>(C) 2010 OpenPilot Project</copyright> <copyright>(C) 2010 OpenPilot Project</copyright>
<license>Your License goes here</license> <license>Your License goes here</license>
<description>UAV telemetry objects</description> <description>UAV telemetry objects</description>
<url>http://www.openpilot.org</url> <url>http://www.openpilot.org</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="1.1"/> <dependency name="Core" version="1.0.0"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

2
ground/src/plugins/uavobjects/uavmetaobject.cpp
View File

@ -1,4 +1,4 @@
#include "UAVMetaObject.h" #include "uavmetaobject.h"
UAVMetaObject::UAVMetaObject(quint32 objID, QString& name, Metadata& mdata, UAVObject* parent): UAVMetaObject::UAVMetaObject(quint32 objID, QString& name, Metadata& mdata, UAVObject* parent):
UAVObject(objID, 0, true, name, sizeof(Metadata)) UAVObject(objID, 0, true, name, sizeof(Metadata))

2
ground/src/plugins/uavobjects/uavmetaobject.h
View File

@ -1,7 +1,7 @@
#ifndef UAVMETAOBJECT_H #ifndef UAVMETAOBJECT_H
#define UAVMETAOBJECT_H #define UAVMETAOBJECT_H
#include "UAVObject.h" #include "uavobject.h"
class UAVMetaObject: public UAVObject class UAVMetaObject: public UAVObject
{ {

3
ground/src/plugins/uavobjects/uavobjects.pri Normal file
View File

@ -0,0 +1,3 @@
include(uavobjects_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(UAVObjects)

8
ground/src/plugins/uavobjects/uavobjects.pro
View File

@ -1,7 +1,9 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = UAVObjects TARGET = UAVObjects
include(../../openpilotgcsplugin.pri) include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri) include(uavobjects_dependencies.pri)
HEADERS += uavobject.h \ HEADERS += uavobject.h \
uavmetaobject.h \ uavmetaobject.h \
uavobjectmanager.h \ uavobjectmanager.h \
@ -9,6 +11,7 @@ HEADERS += uavobject.h \
uavobjectfield.h \ uavobjectfield.h \
uavobjectsinit.h \ uavobjectsinit.h \
uavobjectsplugin.h uavobjectsplugin.h
SOURCES += uavobject.cpp \ SOURCES += uavobject.cpp \
uavmetaobject.cpp \ uavmetaobject.cpp \
uavobjectmanager.cpp \ uavobjectmanager.cpp \
@ -16,4 +19,5 @@ SOURCES += uavobject.cpp \
uavobjectfield.cpp \ uavobjectfield.cpp \
uavobjectsinit.cpp \ uavobjectsinit.cpp \
uavobjectsplugin.cpp uavobjectsplugin.cpp
OTHER_FILES += uavobjects.pluginspec
OTHER_FILES += UAVObjects.pluginspec

2
ground/src/plugins/uavobjects/uavobjects_dependencies.pri Normal file
View File

@ -0,0 +1,2 @@
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/utils/utils.pri)

7
ground/src/plugins/uavtalk/uavtalk.pluginspec → ground/src/plugins/uavtalk/UAVTalk.pluginspec
View File

@ -1,10 +1,11 @@
<plugin name="UAVTalk" version="0.0.1" compatVersion="1.1"> <plugin name="UAVTalk" version="0.0.1" compatVersion="0.0.1">
<vendor>The OpenPilot Project</vendor> <vendor>The OpenPilot Project</vendor>
<copyright>(C) 2010 OpenPilot Project</copyright> <copyright>(C) 2010 OpenPilot Project</copyright>
<license>Your License goes here</license> <license>Your License goes here</license>
<description>UAVTalk telemetry protocol</description> <description>UAVTalk telemetry protocol</description>
<url>http://www.openpilot.org</url> <url>http://www.openpilot.org</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="1.1"/> <dependency name="Core" version="1.0.0"/>
<dependency name="UAVObjects" version="0.0.1"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

2
ground/src/plugins/uavtalk/uavtalk.h
View File

@ -5,7 +5,7 @@
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QMutexLocker>
#include <QSemaphore> #include <QSemaphore>
#include "uavobjects\uavobjectmanager.h" #include "uavobjects/uavobjectmanager.h"
class UAVTalk: public QObject class UAVTalk: public QObject
{ {

3
ground/src/plugins/uavtalk/uavtalk.pri Normal file
View File

@ -0,0 +1,3 @@
include(uavtalk_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(UAVTalk)

5
ground/src/plugins/uavtalk/uavtalk.pro
View File

@ -1,11 +1,12 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = UAVTalk TARGET = UAVTalk
include(../../openpilotgcsplugin.pri) include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri) include(uavtalk_dependencies.pri)
HEADERS += uavtalk.h \ HEADERS += uavtalk.h \
uavtalkplugin.h uavtalkplugin.h
SOURCES += uavtalk.cpp \ SOURCES += uavtalk.cpp \
uavtalkplugin.cpp uavtalkplugin.cpp
HEADERS += telemetry.h HEADERS += telemetry.h
SOURCES += telemetry.cpp SOURCES += telemetry.cpp
OTHER_FILES += uavtalk.pluginspec OTHER_FILES += UAVTalk.pluginspec

3
ground/src/plugins/uavtalk/uavtalk_dependencies.pri Normal file
View File

@ -0,0 +1,3 @@
include(../../plugins/uavobjects/uavobjects.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/utils/utils.pri)