From 9289e0639afacfaa579cffdd70e236ff64d6cd65 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Wed, 29 May 2019 15:49:36 +0700
Subject: [PATCH] [*] Made it buildable and with the latest libs
---
.gitmodules | 13 +++++++++++++
KelvinDashboardGUI/KelvinDashboardGUI.pro | 6 ++++--
KelvinDashboardService/KelvinDashboardService.pro | 4 +++-
libdap | 1 +
libdap-crypto | 1 +
libdap-qt | 1 +
6 files changed, 23 insertions(+), 3 deletions(-)
create mode 160000 libdap
create mode 160000 libdap-crypto
create mode 160000 libdap-qt
diff --git a/.gitmodules b/.gitmodules
index 8519e9c14..a445c0525 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,16 @@
[submodule "kelvin-node"]
path = kelvin-node
url = https://github.com/kelvinblockchain/kelvin-node.git
+ branch = master
+[submodule "libdap-qt"]
+ path = libdap-qt
+ url = https://github.com/cellframe/libdap-qt
+ branch = master
+[submodule "libdap"]
+ path = libdap
+ url = https://github.com/cellframe/libdap
+ branch = master
+[submodule "libdap-crypto"]
+ path = libdap-crypto
+ url = https://github.com/cellframe/libdap-crypto
+ branch = master
diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.pro b/KelvinDashboardGUI/KelvinDashboardGUI.pro
index 13ddf0e9d..a067d00a6 100755
--- a/KelvinDashboardGUI/KelvinDashboardGUI.pro
+++ b/KelvinDashboardGUI/KelvinDashboardGUI.pro
@@ -86,12 +86,14 @@ HEADERS += \
DapServiceClientNativeLinux.h \
DapChainWalletsModel.h
-include (../kelvin-node/kelvin-node.pri)
+include (../libdap/libdap.pri)
+include (../libdap-crypto/libdap-crypto.pri)
+include (../libdap-qt/libdap-qt.pri)
+
include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri)
INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/
$$_PRO_FILE_PWD_/../DapRPCProtocol/
- $$_PRO_FILE_PWD_/../kelvin-node/
DISTFILES +=
diff --git a/KelvinDashboardService/KelvinDashboardService.pro b/KelvinDashboardService/KelvinDashboardService.pro
index 162027ef7..83a63af6c 100755
--- a/KelvinDashboardService/KelvinDashboardService.pro
+++ b/KelvinDashboardService/KelvinDashboardService.pro
@@ -51,7 +51,9 @@ HEADERS += \
DapLogReader.h \
DapChainWalletHandler.h
-include (../kelvin-node/kelvin-node.pri)
+include (../libdap/libdap.pri)
+include (../libdap-crypto/libdap-crypto.pri)
+include (../libdap-qt/libdap-qt.pri)
include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri)
include (../DapRPCProtocol/DapRPCProtocol.pri)
diff --git a/libdap b/libdap
new file mode 160000
index 000000000..5b72cc303
--- /dev/null
+++ b/libdap
@@ -0,0 +1 @@
+Subproject commit 5b72cc303107680535c4591313033611b01c4a0b
diff --git a/libdap-crypto b/libdap-crypto
new file mode 160000
index 000000000..ff63d7626
--- /dev/null
+++ b/libdap-crypto
@@ -0,0 +1 @@
+Subproject commit ff63d762657f9687173db825705b8bf4b958abee
diff --git a/libdap-qt b/libdap-qt
new file mode 160000
index 000000000..948d06585
--- /dev/null
+++ b/libdap-qt
@@ -0,0 +1 @@
+Subproject commit 948d0658552674cd2826bedae80341774a2101d1
--
GitLab