mirror of
https://github.com/RetroShare/RetroShare.git
synced 2026-09-12 19:50:17 +05:00
fix rapidjson include directory
This commit is contained in:
parent
5ac0a4ac7e
commit
5997bf100c
@ -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}"
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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 #####################################
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user