Merge branch 'master' into jsonapi

This commit is contained in:
Gioacchino Mazzurco 2018-06-26 15:19:25 +02:00
commit cb11ad92ea
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
5 changed files with 5 additions and 18 deletions

View file

@ -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 =