diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index a3a6c5d8d..80e37d984 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -21,8 +21,16 @@ TEMPLATE = lib CONFIG *= plugin -DEPENDPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/ -INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/ +# TODO: Why are these not added by retroshare.pri? +DEPENDPATH += $$PWD/../../retroshare-gui/src/ +INCLUDEPATH += $$PWD/../../retroshare-gui/src/ + +# TODO: Why can we not include use_libretroshare.pri +DEPENDPATH += $$PWD/../../libretroshare/src/ +INCLUDEPATH += $$PWD/../../libretroshare/src/ +# rapidjson headers are required for libretroshare +INCLUDEPATH += ../../supportlibs/rapidjson/include + linux-* { target.path = "$${RS_PLUGIN_DIR}" diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index 4b0cae546..5201c5b47 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -110,12 +110,6 @@ TRANSLATIONS += \ lang/FeedReader_tr.ts \ lang/FeedReader_zh_CN.ts -# when rapidjson is mainstream on all distribs, we will not need the sources anymore -# in the meantime, they are part of the RS directory so that it is always possible to find them - -INCLUDEPATH += ../../rapidjson-1.1.0 - - linux-* { CONFIG += link_pkgconfig diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 648dfcb90..2c2e5d221 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -40,11 +40,6 @@ target.files = lib/libVOIP.so DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui -# when rapidjson is mainstream on all distribs, we will not need the sources anymore -# in the meantime, they are part of the RS directory so that it is always possible to find them - -INCLUDEPATH += ../../supportlibs/rapidjson/include - #################################### Linux #####################################