From 55d068852e6f650d02bfcdb4321c2000c9c452f4 Mon Sep 17 00:00:00 2001
From: "papizh.konstantin" <papizh.konstantin@demlabs.net>
Date: Thu, 24 Dec 2020 14:43:20 +0000
Subject: [PATCH] Feat 4565 4
---
dap-sdk/core/libdap.pri | 2 +-
dap-sdk/net/server/libdap-net-server.pri | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dap-sdk/core/libdap.pri b/dap-sdk/core/libdap.pri
index 6a5f474e5a..7916127841 100755
--- a/dap-sdk/core/libdap.pri
+++ b/dap-sdk/core/libdap.pri
@@ -14,7 +14,7 @@ unix: !android {
QMAKE_CFLAGS_DEBUG += -Wall -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-function -Wno-implicit-fallthrough -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable -pg -g3 -ggdb -fno-eliminate-unused-debug-symbols -fno-strict-aliasing
QMAKE_LFLAGS_DEBUG += -pg
DEFINES += _GNU_SOURCE
- LIBS += -lrt
+ LIBS += -lrt -ljson-c -lmagic
}
darwin {
include(src/darwin/darwin.pri)
diff --git a/dap-sdk/net/server/libdap-net-server.pri b/dap-sdk/net/server/libdap-net-server.pri
index 7957fdb252..5e77a2a657 100755
--- a/dap-sdk/net/server/libdap-net-server.pri
+++ b/dap-sdk/net/server/libdap-net-server.pri
@@ -1,5 +1,5 @@
-!win32 {
+android {
include (../../../3rdparty/json-c/json-c.pri)
include (../../../3rdparty/libmagic/file/libmagic.pri)
}
--
GitLab