From e9298c16bc68a1d0977186b36e44c14777e9d886 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 23 Nov 2020 18:18:40 +0100 Subject: [PATCH] Fixed linking with enabled libretroshare_shared with msys2 --- libretroshare/src/use_libretroshare.pri | 8 +++++++- plugins/Common/retroshare_plugin.pri | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/use_libretroshare.pri b/libretroshare/src/use_libretroshare.pri index b287a6591..a8f103b77 100644 --- a/libretroshare/src/use_libretroshare.pri +++ b/libretroshare/src/use_libretroshare.pri @@ -10,7 +10,13 @@ INCLUDEPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src) equals(TARGET, retroshare):equals(TEMPLATE, lib){ } else { LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare - PRE_TARGETDEPS *= $$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/libretroshare.a) + win32-g++|win32-clang-g++:!isEmpty(QMAKE_SH):libretroshare_shared { + # Windows msys2 + LIBRETROSHARE_TARGET=libretroshare.dll.a + } else { + LIBRETROSHARE_TARGET=libretroshare.a + } + PRE_TARGETDEPS *= $$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/$${LIBRETROSHARE_TARGET}) } !include("../../openpgpsdk/src/use_openpgpsdk.pri"):error("Including") diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index 8ed4553e1..d567538e0 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -43,7 +43,13 @@ win32 { } libretroshare_shared { - PRE_TARGETDEPS += $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a + win32-g++|win32-clang-g++:!isEmpty(QMAKE_SH) { + # Windows msys2 + LIBRETROSHARE_TARGET=libretroshare.dll.a + } else { + LIBRETROSHARE_TARGET=libretroshare.a + } + PRE_TARGETDEPS += $$OUT_PWD/../../libretroshare/src/lib/$${LIBRETROSHARE_TARGET} LIBS += -L"$$OUT_PWD/../../libretroshare/src/lib" -lretroshare }