Fixed update of submodule supportlibs/udp-discovery-cpp and supportlibs/restbed with mingw32-make compile

This commit is contained in:
thunder2 2020-08-11 12:36:15 +02:00
parent 532c114048
commit 0df86aa416

View File

@ -866,12 +866,10 @@ rs_jsonapi {
genrestbedlib.variable_out = PRE_TARGETDEPS
win32-g++:isEmpty(QMAKE_SH) {
genrestbedlib.commands = \
cd $$shell_path($${RS_SRC_PATH}) $$escape_expand(\\n\\t) \
git submodule update --init supportlibs/restbed || cd . $$escape_expand(\\n\\t) \
cd $$shell_path($${RESTBED_SRC_PATH}) $$escape_expand(\\n\\t) \
git submodule update --init dependency/asio || cd . $$escape_expand(\\n\\t) \
git submodule update --init dependency/catch || cd . $$escape_expand(\\n\\t )\
git submodule update --init dependency/kashmir || cd . $$escape_expand(\\n\\t) \
cd $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/restbed || cd . $$escape_expand(\\n\\t) \
cd $$shell_path($${RESTBED_SRC_PATH}) && git submodule update --init dependency/asio || cd . $$escape_expand(\\n\\t) \
cd $$shell_path($${RESTBED_SRC_PATH}) && git submodule update --init dependency/catch || cd . $$escape_expand(\\n\\t )\
cd $$shell_path($${RESTBED_SRC_PATH}) && git submodule update --init dependency/kashmir || 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)
} else {
genrestbedlib.commands = \
@ -989,8 +987,7 @@ rs_broadcast_discovery {
udpdiscoverycpplib.variable_out = PRE_TARGETDEPS
win32-g++:isEmpty(QMAKE_SH) {
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) \
cd $$shell_path($${RS_SRC_PATH}) && 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)
} else {
udpdiscoverycpplib.commands = \