Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

use libsam3 git submodule

Browse Source
This commit is contained in:
sehraf 2020-11-27 20:07:51 +01:00
parent 9c71177d3b
commit 8a2efe3e58
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -14,3 +14,6 @@
[submodule "supportlibs/rapidjson"] [submodule "supportlibs/rapidjson"]
path = supportlibs/rapidjson path = supportlibs/rapidjson
url = https://github.com/Tencent/rapidjson.git url = https://github.com/Tencent/rapidjson.git
[submodule "supportlibs/libsam3"]
path = supportlibs/libsam3
url = https://github.com/i2p/libsam3.git

5
libretroshare/src/libretroshare.pro
View File

@ -1029,7 +1029,10 @@ rs_sam3_libsam3 {
libsam3.CONFIG += target_predeps combine libsam3.CONFIG += target_predeps combine
libsam3.variable_out = PRE_TARGETDEPS libsam3.variable_out = PRE_TARGETDEPS
libsam3.commands = \ 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} && \ cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} && \
cd $${LIBSAM3_BUILD_PATH} && \ cd $${LIBSAM3_BUILD_PATH} && \
$(MAKE) build $(MAKE) build

1
supportlibs/libsam3 Submodule

@ -0,0 +1 @@
Subproject commit 8623304b62294dafbe477573f321a464fef721dd