From 8a2efe3e586c63a5d3618fb913da31d37970a3fe Mon Sep 17 00:00:00 2001 From: sehraf Date: Fri, 27 Nov 2020 20:07:51 +0100 Subject: [PATCH] use libsam3 git submodule --- .gitmodules | 3 +++ libretroshare/src/libretroshare.pro | 5 ++++- supportlibs/libsam3 | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 160000 supportlibs/libsam3 diff --git a/.gitmodules b/.gitmodules index c35876fc6..2f69bb7b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ [submodule "supportlibs/rapidjson"] path = supportlibs/rapidjson url = https://github.com/Tencent/rapidjson.git +[submodule "supportlibs/libsam3"] + path = supportlibs/libsam3 + url = https://github.com/i2p/libsam3.git diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 0a8ba44a7..40183772a 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -1029,7 +1029,10 @@ rs_sam3_libsam3 { libsam3.CONFIG += target_predeps combine libsam3.variable_out = PRE_TARGETDEPS libsam3.commands = \ - cd $${RS_SRC_PATH} && \ + cd $${RS_SRC_PATH} && ( \ + git submodule update --init supportlibs/libsam3 || \ + true ) && \ + mkdir -p $${UDP_DISCOVERY_BUILD_PATH} && \ cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} && \ cd $${LIBSAM3_BUILD_PATH} && \ $(MAKE) build diff --git a/supportlibs/libsam3 b/supportlibs/libsam3 new file mode 160000 index 000000000..8623304b6 --- /dev/null +++ b/supportlibs/libsam3 @@ -0,0 +1 @@ +Subproject commit 8623304b62294dafbe477573f321a464fef721dd