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

Fixed git update of submodule supportlibs/libsam3 for MinGW compile

Browse Source
This commit is contained in:
thunder2 2021-11-01 18:45:10 +01:00
parent dc1d5de0db
commit 7be575045b
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libretroshare/src/libretroshare.pro
View File

@ -1034,14 +1034,24 @@ rs_sam3_libsam3 {
libsam3.output = $$clean_path($${LIBSAM3_BUILD_PATH}/libsam3.a) libsam3.output = $$clean_path($${LIBSAM3_BUILD_PATH}/libsam3.a)
libsam3.CONFIG += target_predeps combine libsam3.CONFIG += target_predeps combine
libsam3.variable_out = PRE_TARGETDEPS libsam3.variable_out = PRE_TARGETDEPS
libsam3.commands = \ win32-g++:isEmpty(QMAKE_SH) {
cd $${RS_SRC_PATH} && ( \ LIBSAM3_MAKE_PARAMS = CC=gcc
git submodule update --init supportlibs/libsam3 || \ libsam3.commands = \
true ) && \ cd /D $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/libsam3 || cd . $$escape_expand(\\n\\t) \
mkdir -p $${LIBSAM3_BUILD_PATH} && \ $(CHK_DIR_EXISTS) $$shell_path($$LIBSAM3_BUILD_PATH) $(MKDIR) $$shell_path($${LIBSAM3_BUILD_PATH}) $$escape_expand(\\n\\t) \
(cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} || true) && \ $(COPY_DIR) $$shell_path($${LIBSAM3_SRC_PATH}) $$shell_path($${LIBSAM3_BUILD_PATH}) || cd . $$escape_expand(\\n\\t)
cd $${LIBSAM3_BUILD_PATH} && \ } else {
$(MAKE) build LIBSAM3_MAKE_PARAMS =
libsam3.commands = \
cd $${RS_SRC_PATH} && ( \
git submodule update --init supportlibs/libsam3 || \
true ) && \
mkdir -p $${LIBSAM3_BUILD_PATH} && \
(cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} || true) &&
}
libsam3.commands += \
cd $$shell_path($${LIBSAM3_BUILD_PATH}) && \
$(MAKE) build $${LIBSAM3_MAKE_PARAMS}
QMAKE_EXTRA_COMPILERS += libsam3 QMAKE_EXTRA_COMPILERS += libsam3
} }