b

App/App.pro

@@ -69,8 +69,6 @@ LIBS += -L$$PWD/../thirdpart/lib -lSerialPort
 LIBS += -L$$PWD/../thirdpart/lib -lClientLink
 LIBS += -L$$PWD/../thirdpart/lib -lqNavigation
 LIBS += -L$$PWD/../thirdpart/lib -lCockpit
-
-
 LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNode
 LIBS += -L$$PWD/../thirdpart/lib -lopmapwidget
 

ClientLinkDialog/ClientLinkDialog.pro

@@ -10,6 +10,11 @@ TEMPLATE = lib
 
 DEFINES += CLIENTLINK_LIBRARY
 
+
+CONFIG += plugin \
+           resources_big
+
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the

Cockpit/Cockpit.pro

@@ -11,6 +11,12 @@ TEMPLATE = lib
 
 DEFINES += COCKPIT_LIBRARY
 
+
+CONFIG += plugin \
+           resources_big
+
+
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the

MavLinkNode/MavLinkNode.pro

@@ -15,6 +15,10 @@ TEMPLATE = lib
 
 DEFINES += MAV_LIBRARY
 
+
+CONFIG += resources_big
+
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the

SerialPortDialog/SerialPortDialog.pro

@@ -11,6 +11,10 @@ TEMPLATE = lib
 
 DEFINES += SERIALPORT_LIBRARY
 
+CONFIG += resources_big
+
+
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -32,7 +36,8 @@ FORMS += \
 
 HEADERS += \
     $$PWD/connectdialog.h \
-    $$PWD/disconnectdialog.h
+    $$PWD/disconnectdialog.h \
+    serialportlib.h
 
 SOURCES += \
     $$PWD/connectdialog.cpp \
@@ -58,4 +63,12 @@ win32 {
     system(xcopy $$src_dir $$dst_dir /y /e)
 }
 
+unix {
+    src_dir = $$PWD/*.h
+    dst_dir = $$PWD/../thirdpart/include/
+
+    !exists($$dst_dir): system(mkdir -p $$dst_dir)
+
+    system(cp $$src_dir $$dst_dir -arf )
+}
 

SerialPortDialog/connectdialog.h

@@ -8,11 +8,16 @@
 #include <QSerialPort>
 #include <QSerialPortInfo>
 #include <QSettings>
+#include "serialportlib.h"
+
 
 namespace Ui {
 class ConnectDialog;
 }
 
+
+
+
 class ConnectDialog : public QDialog
 {
     Q_OBJECT

SerialPortDialog/disconnectdialog.h

@@ -2,11 +2,15 @@
 #define DISCONNECTDIALOG_H
 
 #include <QDialog>
+#include "serialportlib.h"
+
 
 namespace Ui {
 class disconnectdialog;
 }
 
+
+
 class disconnectdialog : public QDialog
 {
     Q_OBJECT

SerialPortDialog/serialportlib.h

@@ -0,0 +1,20 @@
+#ifndef SERIALPORTLIB_H
+#define SERIALPORTLIB_H
+
+
+//这一句用于输出lib exp文件
+#ifdef QtSerialPort
+#if defined(SERIALPORT_LIBRARY)
+#  define SHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define SHARED_EXPORT Q_DECL_IMPORT
+#endif
+#endif
+
+
+
+
+
+
+
+#endif // SERIALPORTLIB_H

Skin/skin.cpp

@@ -19,3 +19,13 @@ void Skin::InitSkin()
 {
     qDebug() << "Skin InitOk: build at " << __DATE__ << __TIME__;
 }
+
+
+
+
+
+
+
+
+
+

opmap/core/urlfactory.cpp

@@ -679,6 +679,10 @@ Placemark UrlFactory::GetPlacemarkFromReverseGeocoderUrl(const QString &url, con
 }
 double UrlFactory::GetDistance(internals::PointLatLng p1, internals::PointLatLng p2)
 {
+
+
+
+
     double dLat1InRad  = p1.Lat() * (M_PI / 180);
     double dLong1InRad = p1.Lng() * (M_PI / 180);
     double dLat2InRad  = p2.Lat() * (M_PI / 180);

opmap/core/urlfactory.h

@@ -44,6 +44,11 @@
 #include <QTextCodec>
 #include "cmath"
 
+#include "math.h"
+
+
+//#define M_PI 3.14159265358
+
 namespace core {
 class UrlFactory : public QObject, public ProviderStrings {
     Q_OBJECT

opmap/internals/internals.pro

@@ -10,6 +10,7 @@ QT += network
 QT += sql
 CONFIG += staticlib\
            plugin
+
 HEADERS += core.h \
     mousewheelzoomtype.h \
     rectangle.h \

opmap/mapwidget/mapwidget.pro

@@ -15,8 +15,7 @@ MOC_DIR         = $$PWD/../../build
 OBJECTS_DIR     = $$PWD/../../build
 
 
-#include (../core/core.pri)
-#include (../internals/internals.pri)
+CONFIG += resources_big
 
 SOURCES += $$PWD/mapgraphicitem.cpp \
     $$PWD/opmapwidget.cpp \

qNavigationWidget/qnavigationwidget.pro

@@ -11,6 +11,8 @@ TEMPLATE = lib
 
 DEFINES += QNAVGATION_LIBRARY
 
+CONFIG += resources_big
+
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which has been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the