Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-23 00:09:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed linking with enabled libretroshare_shared with msys2

Browse Source
This commit is contained in:
thunder2 2020-11-23 18:18:40 +01:00
parent 5fc8689bf2
commit e9298c16bc
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/use_libretroshare.pri
View File

@ -10,7 +10,13 @@ INCLUDEPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src)
equals(TARGET, retroshare):equals(TEMPLATE, lib){ equals(TARGET, retroshare):equals(TEMPLATE, lib){
} else { } else {
LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare 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") !include("../../openpgpsdk/src/use_openpgpsdk.pri"):error("Including")

8
plugins/Common/retroshare_plugin.pri
View File

@ -43,7 +43,13 @@ win32 {
} }
libretroshare_shared { 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 LIBS += -L"$$OUT_PWD/../../libretroshare/src/lib" -lretroshare
} }