Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 00:27:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added git update of submodule supportlibs/udp-discovery-cpp for MinGW compile

Browse source
This commit is contained in:
thunder2 2020-08-10 22:12:13 +02:00
parent 2a5b35fbca
commit 1760f819c8
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libretroshare/src/libretroshare.pro
View file

@ -858,14 +858,14 @@ rs_jsonapi {
genrestbedlib.output = $$clean_path($${RESTBED_BUILD_PATH}/librestbed.a) genrestbedlib.output = $$clean_path($${RESTBED_BUILD_PATH}/librestbed.a)
genrestbedlib.CONFIG += target_predeps combine genrestbedlib.CONFIG += target_predeps combine
genrestbedlib.variable_out = PRE_TARGETDEPS genrestbedlib.variable_out = PRE_TARGETDEPS
genrestbedlib.commands = \ genrestbedlib.commands = \
cd $${RS_SRC_PATH} && ( \ cd $${RS_SRC_PATH} && ( \
git submodule update --init supportlibs/restbed ; \ git submodule update --init supportlibs/restbed ; \
cd $${RESTBED_SRC_PATH} ; \ cd $${RESTBED_SRC_PATH} ; \
git submodule update --init dependency/asio ; \ git submodule update --init dependency/asio ; \
git submodule update --init dependency/catch ; \ git submodule update --init dependency/catch ; \
git submodule update --init dependency/kashmir ; \ git submodule update --init dependency/kashmir ; \
true ) && \ true ) && \
mkdir -p $${RESTBED_BUILD_PATH} && cd $${RESTBED_BUILD_PATH} && \ mkdir -p $${RESTBED_BUILD_PATH} && cd $${RESTBED_BUILD_PATH} && \
cmake \ cmake \
-DCMAKE_CXX_COMPILER=$$QMAKE_CXX \ -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
@ -962,8 +962,10 @@ rs_broadcast_discovery {
udpdiscoverycpplib.output = $$clean_path($${UDP_DISCOVERY_BUILD_PATH}/libudp-discovery.a) udpdiscoverycpplib.output = $$clean_path($${UDP_DISCOVERY_BUILD_PATH}/libudp-discovery.a)
udpdiscoverycpplib.CONFIG += target_predeps combine udpdiscoverycpplib.CONFIG += target_predeps combine
udpdiscoverycpplib.variable_out = PRE_TARGETDEPS udpdiscoverycpplib.variable_out = PRE_TARGETDEPS
isEmpty(QMAKE_SH) { win32-g++:isEmpty(QMAKE_SH) {
udpdiscoverycpplib.commands = \ udpdiscoverycpplib.commands = \
cd $$shell_path($${RS_SRC_PATH}) $$escape_expand(\\n\\t) \
git submodule update --init supportlibs/udp-discovery-cpp || cd . $$escape_expand(\\n\\t) \
$(CHK_DIR_EXISTS) $$shell_path($$UDP_DISCOVERY_BUILD_PATH) $(MKDIR) $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) $$escape_expand(\\n\\t) $(CHK_DIR_EXISTS) $$shell_path($$UDP_DISCOVERY_BUILD_PATH) $(MKDIR) $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) $$escape_expand(\\n\\t)
} else { } else {
udpdiscoverycpplib.commands = \ udpdiscoverycpplib.commands = \