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 restbed compilation on Windows

Browse Source
This commit is contained in:
hunbernd 2019-03-09 20:38:33 +01:00
parent 54899f8378
commit 294d711cc3
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libretroshare/src/libretroshare.pro
View File

@ -862,6 +862,19 @@ rs_jsonapi {
no_rs_cross_compiling { no_rs_cross_compiling {
restbed.target = $$clean_path($${RESTBED_BUILD_PATH}/library/librestbed.a) restbed.target = $$clean_path($${RESTBED_BUILD_PATH}/library/librestbed.a)
win32-g++ {
restbed.commands = \
cd $${RS_SRC_PATH} && \
git submodule update --init --recommend-shallow supportlibs/restbed && \
cd $${RESTBED_SRC_PATH} && \
git submodule update --init --recommend-shallow dependency/asio && \
git submodule update --init --recommend-shallow dependency/catch && \
git submodule update --init --recommend-shallow dependency/kashmir && \
mkdir -p $${RESTBED_BUILD_PATH}; cd $${RESTBED_BUILD_PATH} && \
cmake -DCMAKE_CXX_COMPILER=$$QMAKE_CXX -G \"MSYS Makefiles\" -DBUILD_SSL=OFF \
-DCMAKE_INSTALL_PREFIX=. -B. -H$$shell_path($${RESTBED_SRC_PATH}) && \
make && make install
} else {
restbed.commands = \ restbed.commands = \
cd $${RS_SRC_PATH};\ cd $${RS_SRC_PATH};\
git submodule update --init --recommend-shallow supportlibs/restbed;\ git submodule update --init --recommend-shallow supportlibs/restbed;\
@ -873,6 +886,7 @@ rs_jsonapi {
cmake -DCMAKE_CXX_COMPILER=$$QMAKE_CXX -DBUILD_SSL=OFF \ cmake -DCMAKE_CXX_COMPILER=$$QMAKE_CXX -DBUILD_SSL=OFF \
-DCMAKE_INSTALL_PREFIX=. -B. -H$$shell_path($${RESTBED_SRC_PATH});\ -DCMAKE_INSTALL_PREFIX=. -B. -H$$shell_path($${RESTBED_SRC_PATH});\
make; make install make; make install
}
QMAKE_EXTRA_TARGETS += restbed QMAKE_EXTRA_TARGETS += restbed
libretroshare.depends += restbed libretroshare.depends += restbed
PRE_TARGETDEPS *= $${restbed.target} PRE_TARGETDEPS *= $${restbed.target}