From 67c607cb3228e1282dd2375ec46a8b9be9295742 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Tue, 23 Mar 2021 23:04:10 +0100 Subject: [PATCH] Fix Android compilation --- build_scripts/Android/README.asciidoc | 6 +++--- libretroshare/src/pqi/pqinetwork.cc | 14 +++++++------- libretroshare/src/use_libretroshare.pri | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build_scripts/Android/README.asciidoc b/build_scripts/Android/README.asciidoc index 3f978cfd1..d5670e10c 100644 --- a/build_scripts/Android/README.asciidoc +++ b/build_scripts/Android/README.asciidoc @@ -75,7 +75,7 @@ deployment) [source,makefile] ------------------------------------------------------------------------------- -CONFIG+=retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search +CONFIG+=retroshare_service CONFIG+=rs_jsonapi CONFIG+=no_keywords RS_UPNP_LIB=miniupnpc JSONAPI_GENERATOR_EXE=Your_Path/jsonapi-generator/src/jsonapi-generator NATIVE_LIBS_TOOLCHAIN_PATH=Your_Path/retroshare-android-16-arm/ @@ -391,8 +391,8 @@ https://gitlab.com/elRepo.io/elRepo.io-android/-/blob/master/android/app/build.g == License -Copyright (C) 2016-2020 Gioacchino Mazzurco + -Copyright (C) 2020 Asociación Civil Altermundi + +Copyright (C) 2016-2021 Gioacchino Mazzurco + +Copyright (C) 2020-2021 Asociación Civil Altermundi + This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License. diff --git a/libretroshare/src/pqi/pqinetwork.cc b/libretroshare/src/pqi/pqinetwork.cc index 18fe71fc0..a5ca76035 100644 --- a/libretroshare/src/pqi/pqinetwork.cc +++ b/libretroshare/src/pqi/pqinetwork.cc @@ -4,7 +4,8 @@ * libretroshare: retroshare core library * * * * Copyright (C) 2004-2006 Robert Fernie * - * Copyright (C) 2015-2018 Gioacchino Mazzurco * + * Copyright (C) 2015-2021 Gioacchino Mazzurco * + * Copyright (C) 2021 Asociación Civil Altermundi * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU Lesser General Public License as * @@ -30,14 +31,13 @@ # include #endif // def __ANDROID__ -#include "pqi/pqinetwork.h" -#include "util/rsnet.h" - -#include +#include #include -#include +#include #include +#include "pqi/pqinetwork.h" +#include "util/rsnet.h" #include "util/rsdebug.h" #include "util/rsstring.h" #include "util/rsnet.h" @@ -325,7 +325,7 @@ bool getLocalAddresses(std::vector& addrs) } free(adapter_addresses); #elif defined(__ANDROID__) && __ANDROID_API__ < 24 - foreach(QHostAddress qAddr, QNetworkInterface::allAddresses()) + for(auto& qAddr: QNetworkInterface::allAddresses()) { sockaddr_storage tmpAddr; sockaddr_storage_clear(tmpAddr); diff --git a/libretroshare/src/use_libretroshare.pri b/libretroshare/src/use_libretroshare.pri index b76c4a5da..ee8872104 100644 --- a/libretroshare/src/use_libretroshare.pri +++ b/libretroshare/src/use_libretroshare.pri @@ -59,7 +59,7 @@ linux-* { mLibs += dl } -rs_deep_channels_index | rs_deep_files_index { +rs_deep_channels_index | rs_deep_files_index | rs_deep_forums_index { mLibs += xapian win32-g++|win32-clang-g++:mLibs += rpcrt4 }