diff --git a/libresapi/src/libresapi.pro b/libresapi/src/libresapi.pro index 161ce9bf7..5f4c973e9 100644 --- a/libresapi/src/libresapi.pro +++ b/libresapi/src/libresapi.pro @@ -9,10 +9,6 @@ DESTDIR = lib !include(use_libresapi.pri):error("Including") -# 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 INCLUDEPATH += ../../libretroshare/src libresapilocalserver { diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index a2db59f79..45d55f077 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -17,11 +17,6 @@ DESTDIR = lib #QMAKE_CFLAGS += -Werror #QMAKE_CXXFLAGS += -Werror -# 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 - debug { # DEFINES *= DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG diff --git a/libretroshare/src/use_libretroshare.pri b/libretroshare/src/use_libretroshare.pri index 9971cea7d..2e26fbddd 100644 --- a/libretroshare/src/use_libretroshare.pri +++ b/libretroshare/src/use_libretroshare.pri @@ -13,6 +13,11 @@ bitdht { !include("../../libbitdht/src/use_libbitdht.pri"):error("Including") } +# 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 *= $$system_path($$clean_path($${PWD}/../../rapidjson-1.1.0)) + sLibs = mLibs = $$RS_SQL_LIB ssl crypto $$RS_THREAD_LIB $$RS_UPNP_LIB dLibs = diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 48e10a377..30b2af946 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -10,11 +10,6 @@ DEFINES += TARGET=\\\"$${TARGET}\\\" DEPENDPATH *= $${PWD} $${RS_INCLUDE_DIR} retroshare-gui INCLUDEPATH *= $${PWD} retroshare-gui -# 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 - libresapihttpserver { !include("../../libresapi/src/use_libresapi.pri"):error("Including") HEADERS *= gui/settings/WebuiPage.h diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 6c95d278c..05f5e99e1 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -16,10 +16,6 @@ libresapihttpserver { !include("../../libretroshare/src/use_libretroshare.pri"):error("Including") -# 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 ########################################## linux-* {