mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 22:25:04 -04:00
Merge branch 'master' into jsonapi
This commit is contained in:
commit
cb11ad92ea
5 changed files with 5 additions and 18 deletions
|
@ -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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue