hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整输出地址

Browse Source
This commit is contained in:
hm
2021-05-15 17:36:33 +08:00
parent a51b447d05
commit 092aabd914
11 changed files with 88 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -14,3 +14,4 @@ html/
thirdpart
app_bin
build
bin
App/App.pro
+20 -30
View File
@@ -64,7 +64,6 @@ include (./HealthUI/HealthUI.pri)
CONFIG(debug, debug|release) {
# Target name.
TARGET = GCS_debug
@@ -74,6 +73,10 @@ CONFIG(release, debug|release) {
TARGET = GCS_release
}
#temp file
DESTDIR = $$PWD/../bin
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
TEMPLATE = app
@@ -117,7 +120,7 @@ QML_DESIGNER_IMPORT_PATH += $$PWD
#添加程序运行的第三方库
INCLUDEPATH += $$PWD/../thirdpart/include
INCLUDEPATH += $$DESTDIR/include
#添加mavlink目录(给mavlinknode模块打补丁)
@@ -132,43 +135,30 @@ INCLUDEPATH += $$PWD/../mavlink \
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../thirdpart/lib -lCockpitd
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNoded
LIBS += -L$$PWD/../thirdpart/lib -lcored
LIBS += -L$$PWD/../thirdpart/lib -linternalsd
LIBS += -L$$PWD/../thirdpart/lib -lopmapwidgetd
LIBS += -L$$PWD/../thirdpart/lib -lDlinkd
LIBS += -L$$PWD/../thirdpart/lib -lSkind
LIBS += -L$$DESTDIR -lCockpitd
LIBS += -L$$DESTDIR -lMavLinkNoded
LIBS += -L$$DESTDIR -lcored
LIBS += -L$$DESTDIR -linternalsd
LIBS += -L$$DESTDIR -lopmapwidgetd
LIBS += -L$$DESTDIR -lDlinkd
LIBS += -L$$DESTDIR -lSkind
}
CONFIG(release, debug|release) {
LIBS += -L$$PWD/../thirdpart/lib -lCockpit
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNode
LIBS += -L$$PWD/../thirdpart/lib -lcore
LIBS += -L$$PWD/../thirdpart/lib -linternals
LIBS += -L$$PWD/../thirdpart/lib -lopmapwidget
LIBS += -L$$PWD/../thirdpart/lib -lDlink
LIBS += -L$$PWD/../thirdpart/lib -lSkin
LIBS += -L$$DESTDIR -lCockpit
LIBS += -L$$DESTDIR -lMavLinkNode
LIBS += -L$$DESTDIR -lcore
LIBS += -L$$DESTDIR -linternals
LIBS += -L$$DESTDIR -lopmapwidget
LIBS += -L$$DESTDIR -lDlink
LIBS += -L$$DESTDIR -lSkin
}
#temp file
DESTDIR = $$PWD/../app_bin
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
#复制运行库到程序目录
win32|win64 {
src_dir = $$PWD\\..\\thirdpart\\lib\\*.dll
dst_dir = $$PWD\\..\\app_bin\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
src_dir ~= s,/,\\,g
dst_dir ~= s,/,\\,g
#要发布时要打开，复制必要的库文件
#system(xcopy $$src_dir $$dst_dir /y /e)
#复制qml文件
Cockpit/Cockpit.pro
+5 -8
View File
@@ -18,7 +18,9 @@ CONFIG(release, debug|release) {
TARGET = Cockpit
}
DESTDIR = $$PWD/../bin
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
TEMPLATE = lib
@@ -52,16 +54,11 @@ SOURCES += \
$$PWD/Cockpit.cpp
DESTDIR = $$PWD/../thirdpart/lib
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
DEFINES += QtCockpit
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -73,7 +70,7 @@ win32|win64 {
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../thirdpart/include/
dst_dir = $$PWD/../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
GCS.pro
+1
View File
@@ -11,3 +11,4 @@ SUBDIRS += MavLinkNode
SUBDIRS += dlink
SUBDIRS += App
MavLinkNode/MavLinkNode.pro
+10 -10
View File
@@ -44,7 +44,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
#include (./ParameterInspector/ParameterInspector.pri)
#include (./MAVLinkInspector/MAVLinkInspector.pri)
DESTDIR = $$PWD/../thirdpart/lib
DESTDIR = $$PWD/../bin
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
@@ -76,18 +76,18 @@ SOURCES += \
sbusparser.cpp \
statusprocess.cpp
INCLUDEPATH += $$PWD/../thirdpart/include
INCLUDEPATH += $$DESTDIR/include
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../thirdpart/lib -lcored
LIBS += -L$$PWD/../thirdpart/lib -linternalsd
LIBS += -L$$PWD/../thirdpart/lib -lopmapwidgetd
LIBS += -L$$DESTDIR -lcored
LIBS += -L$$DESTDIR -linternalsd
LIBS += -L$$DESTDIR -lopmapwidgetd
}
CONFIG(release, debug|release) {
LIBS += -L$$PWD/../thirdpart/lib -lcore
LIBS += -L$$PWD/../thirdpart/lib -linternals
LIBS += -L$$PWD/../thirdpart/lib -lopmapwidget
LIBS += -L$$DESTDIR -lcore
LIBS += -L$$DESTDIR -linternals
LIBS += -L$$DESTDIR -lopmapwidget
}
@@ -109,7 +109,7 @@ INCLUDEPATH += $$PWD/../mavlink \
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -123,7 +123,7 @@ win32|win64 {
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../thirdpart/include/
dst_dir = $$PWD/../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
Skin/Skin.pro
+5 -10
View File
@@ -10,14 +10,8 @@ QT -= gui
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
# Target name.
TARGET = Skind
TARGET = $$join(TARGET,,,d)
}
CONFIG(release, debug|release) {
# Target name.
TARGET = Skin
}
TEMPLATE = lib
@@ -47,7 +41,8 @@ unix {
INSTALLS += target
}
DESTDIR = $$PWD/../thirdpart/lib
DESTDIR = $$PWD/../bin
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
@@ -58,7 +53,7 @@ RESOURCES += \
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -70,7 +65,7 @@ win32|win64 {
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../thirdpart/include/
dst_dir = $$PWD/../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
dlink/dlink.pro
+12 -15
View File
@@ -5,18 +5,15 @@ QT += network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = Dlink
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
# Target name.
TARGET = Dlinkd
}
CONFIG(release, debug|release) {
# Target name.
TARGET = Dlink
TARGET = $$join(TARGET,,,d)
}
TEMPLATE = lib
@@ -28,7 +25,9 @@ CONFIG += c++11 \
resources_big \
warn_off
DESTDIR = $$PWD/../bin
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
# The following define makes your compiler emit warnings if you use
@@ -51,7 +50,7 @@ SOURCES += \
$$PWD/dlink.cpp
#加入第三方库
INCLUDEPATH += $$PWD/../thirdpart/include
INCLUDEPATH += $$DESTDIR/include
#添加mavlink目录
INCLUDEPATH += $$PWD/../mavlink \
@@ -70,22 +69,20 @@ INCLUDEPATH += $$PWD/../mavlink \
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNoded
LIBS += -L$$DESTDIR -lMavLinkNoded
}
CONFIG(release, debug|release) {
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNode
LIBS += -L$$DESTDIR -lMavLinkNode
}
DESTDIR = $$PWD/../thirdpart/lib
MOC_DIR = $$PWD/../build
OBJECTS_DIR = $$PWD/../build
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -97,7 +94,7 @@ win32|win64 {
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../thirdpart/include/
dst_dir = $$PWD/../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
opmap/core/core.pro
+4 -7
View File
@@ -20,12 +20,9 @@ DEFINES += QtOpmapCore
DEFINES += DEBUG_GMAPS
#VS的补丁 使用 自定义的数学常数
DEFINES += _USE_MATH_DEFINES
#目标生成路径
DESTDIR = $$PWD/../../thirdpart/lib
DESTDIR = $$PWD/../../bin
MOC_DIR = $$PWD/../../build
OBJECTS_DIR = $$PWD/../../build
@@ -79,14 +76,14 @@ HEADERS += opmaps.h \
#hander
INCLUDEPATH += $$PWD/../../thirdpart/include
INCLUDEPATH += $$DESTDIR/include
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -98,7 +95,7 @@ win32|win64 {
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../../thirdpart/include/
dst_dir = $$PWD/../../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
opmap/internals/internals.pro
+7 -7
View File
@@ -20,7 +20,7 @@ DEFINES += QtOpmapInternals
DEFINES += _USE_MATH_DEFINES
#目标生成路径
DESTDIR = $$PWD/../../thirdpart/lib
DESTDIR = $$PWD/../../bin
MOC_DIR = $$PWD/../../build
OBJECTS_DIR = $$PWD/../../build
@@ -63,21 +63,21 @@ SOURCES += ./projections/lks94projection.cpp \
./projections/platecarreeprojection.cpp \
./projections/platecarreeprojectionpergo.cpp
INCLUDEPATH += $$PWD/../../thirdpart/include
INCLUDEPATH += $$PWD/../../bin/include
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../../thirdpart/lib -lcored
LIBS += -L$$PWD/../../bin -lcored
}
CONFIG(release, debug|release) {
LIBS += -L$$PWD/../../thirdpart/lib -lcore
LIBS += -L$$PWD/../../bin -lcore
}
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -89,7 +89,7 @@ win32|win64 {
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../../thirdpart/include/
dst_dir = $$PWD/../../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
@@ -97,7 +97,7 @@ unix {
src_prodir = $$PWD/projections/*.h
dst_prodir = $$PWD/../../thirdpart/include/projections/
dst_prodir = $$PWD/../../bin/include/projections/
!exists($$dst_prodir): system(mkdir -p $$dst_prodir)
opmap/mapwidget/mapwidget.pro
+19 -18
View File
@@ -7,15 +7,16 @@ QT += svg
#execution_character_set("utf-8")
# Capture whether this is a release/debug build.
TARGET = opmapwidget
CONFIG(debug, debug|release) {
# Target name.
TARGET = opmapwidgetd
}
CONFIG(release, debug|release) {
# Target name.
TARGET = opmapwidget
TARGET = $$join(TARGET,,,d)
}
TEMPLATE = lib
@@ -28,7 +29,7 @@ DEFINES += QtopmapWidget
DEFINES += _USE_MATH_DEFINES
#目标生成路径
DESTDIR = $$PWD/../../thirdpart/lib
DESTDIR = $$PWD/../../bin
MOC_DIR = $$PWD/../../build
OBJECTS_DIR = $$PWD/../../build
@@ -73,7 +74,7 @@ RESOURCES += mapresources.qrc
FORMS += \
mapripform.ui \
INCLUDEPATH += $$PWD/../../thirdpart/include
INCLUDEPATH += $$DESTDIR/include
#添加mavlink目录
INCLUDEPATH += $$PWD/../../mavlink \
@@ -86,17 +87,17 @@ INCLUDEPATH += $$PWD/../../mavlink \
# Capture whether this is a release/debug build.
CONFIG(debug, debug|release) {
LIBS += -L$$PWD/../../thirdpart/lib -lcored
LIBS += -L$$PWD/../../thirdpart/lib -linternalsd
LIBS += -L$$DESTDIR -lcored
LIBS += -L$$DESTDIR -linternalsd
}
CONFIG(release, debug|release) {
LIBS += -L$$PWD/../../thirdpart/lib -lcore
LIBS += -L$$PWD/../../thirdpart/lib -linternals
LIBS += -L$$DESTDIR -lcore
LIBS += -L$$DESTDIR -linternals
}
win32|win64 {
src_dir = $$PWD\\*.h
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
dst_dir = $$PWD\\..\\..\\bin\\include\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
@@ -107,21 +108,21 @@ win32|win64 {
#复制qml文件
qml_src_dir = $$PWD\\*.qml
qml_dst_dir = $$PWD\\..\\..\\app_bin\\qml\\
#qml_src_dir = $$PWD\\*.qml
#qml_dst_dir = $$PWD\\..\\..\\bin\\qml\\
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
# Replace slashes in paths with backslashes for Windows
qml_src_dir ~= s,/,\\,g
qml_dst_dir ~= s,/,\\,g
#qml_src_dir ~= s,/,\\,g
#qml_dst_dir ~= s,/,\\,g
system(xcopy $$qml_src_dir $$qml_dst_dir /y /s)
#system(xcopy $$qml_src_dir $$qml_dst_dir /y /s)
}
unix {
src_dir = $$PWD/*.h
dst_dir = $$PWD/../../thirdpart/include/
dst_dir = $$PWD/../../bin/include/
!exists($$dst_dir): system(mkdir -p $$dst_dir)
opmap/opmap.pro
+4
View File
@@ -5,6 +5,10 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += internals
SUBDIRS += core
SUBDIRS += mapwidget