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

Cleanup rapidjson inclusion

Browse Source 
Fix compilation error of android service
This commit is contained in:
Gioacchino Mazzurco 2018-06-26 15:12:16 +02:00
parent 2f159efb10
commit 502459a25a
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
5 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libresapi/src/libresapi.pro
View File

@ -9,10 +9,6 @@ DESTDIR = lib
!include(use_libresapi.pri):error("Including") !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 INCLUDEPATH += ../../libretroshare/src
libresapilocalserver { libresapilocalserver {

5
libretroshare/src/libretroshare.pro
View File

@ -17,11 +17,6 @@ DESTDIR = lib
#QMAKE_CFLAGS += -Werror #QMAKE_CFLAGS += -Werror
#QMAKE_CXXFLAGS += -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 { debug {
# DEFINES *= DEBUG # DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG

5
libretroshare/src/use_libretroshare.pri
View File

@ -13,6 +13,11 @@ bitdht {
!include("../../libbitdht/src/use_libbitdht.pri"):error("Including") !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 = sLibs =
mLibs = $$RS_SQL_LIB ssl crypto $$RS_THREAD_LIB $$RS_UPNP_LIB mLibs = $$RS_SQL_LIB ssl crypto $$RS_THREAD_LIB $$RS_UPNP_LIB
dLibs = dLibs =

5
retroshare-gui/src/retroshare-gui.pro
View File

@ -10,11 +10,6 @@ DEFINES += TARGET=\\\"$${TARGET}\\\"
DEPENDPATH *= $${PWD} $${RS_INCLUDE_DIR} retroshare-gui DEPENDPATH *= $${PWD} $${RS_INCLUDE_DIR} retroshare-gui
INCLUDEPATH *= $${PWD} 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 { libresapihttpserver {
!include("../../libresapi/src/use_libresapi.pri"):error("Including") !include("../../libresapi/src/use_libresapi.pri"):error("Including")
HEADERS *= gui/settings/WebuiPage.h HEADERS *= gui/settings/WebuiPage.h

4
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -16,10 +16,6 @@ libresapihttpserver {
!include("../../libretroshare/src/use_libretroshare.pri"):error("Including") !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 ##########################################
linux-* { linux-* {