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

Fix Android compilation

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2021-03-23 23:04:10 +01:00
parent 914a2eca55
commit 67c607cb32
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_scripts/Android/README.asciidoc
View File

@ -75,7 +75,7 @@ deployment)
[source,makefile] [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 RS_UPNP_LIB=miniupnpc
JSONAPI_GENERATOR_EXE=Your_Path/jsonapi-generator/src/jsonapi-generator JSONAPI_GENERATOR_EXE=Your_Path/jsonapi-generator/src/jsonapi-generator
NATIVE_LIBS_TOOLCHAIN_PATH=Your_Path/retroshare-android-16-arm/ 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 == License
Copyright (C) 2016-2020 Gioacchino Mazzurco <gio@eigenlab.org> + Copyright (C) 2016-2021 Gioacchino Mazzurco <gio@eigenlab.org> +
Copyright (C) 2020 Asociación Civil Altermundi <info@altermundi.net> + Copyright (C) 2020-2021 Asociación Civil Altermundi <info@altermundi.net> +
This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License. This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License.

14
libretroshare/src/pqi/pqinetwork.cc
View File

@ -4,7 +4,8 @@
* libretroshare: retroshare core library * * libretroshare: retroshare core library *
* * * *
* Copyright (C) 2004-2006 Robert Fernie <retroshare@lunamutt.com> * * Copyright (C) 2004-2006 Robert Fernie <retroshare@lunamutt.com> *
* Copyright (C) 2015-2018 Gioacchino Mazzurco <gio@eigenlab.org> * * Copyright (C) 2015-2021 Gioacchino Mazzurco <gio@eigenlab.org> *
* Copyright (C) 2021 Asociación Civil Altermundi <info@altermundi.net> *
* * * *
* This program is free software: you can redistribute it and/or modify * * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as * * it under the terms of the GNU Lesser General Public License as *
@ -30,14 +31,13 @@
# include <android/api-level.h> # include <android/api-level.h>
#endif // def __ANDROID__ #endif // def __ANDROID__
#include "pqi/pqinetwork.h" #include <cerrno>
#include "util/rsnet.h"
#include <errno.h>
#include <iostream> #include <iostream>
#include <stdio.h> #include <cstdio>
#include <unistd.h> #include <unistd.h>
#include "pqi/pqinetwork.h"
#include "util/rsnet.h"
#include "util/rsdebug.h" #include "util/rsdebug.h"
#include "util/rsstring.h" #include "util/rsstring.h"
#include "util/rsnet.h" #include "util/rsnet.h"
@ -325,7 +325,7 @@ bool getLocalAddresses(std::vector<sockaddr_storage>& addrs)
} }
free(adapter_addresses); free(adapter_addresses);
#elif defined(__ANDROID__) && __ANDROID_API__ < 24 #elif defined(__ANDROID__) && __ANDROID_API__ < 24
foreach(QHostAddress qAddr, QNetworkInterface::allAddresses()) for(auto& qAddr: QNetworkInterface::allAddresses())
{ {
sockaddr_storage tmpAddr; sockaddr_storage tmpAddr;
sockaddr_storage_clear(tmpAddr); sockaddr_storage_clear(tmpAddr);

2
libretroshare/src/use_libretroshare.pri
View File

@ -59,7 +59,7 @@ linux-* {
mLibs += dl mLibs += dl
} }
rs_deep_channels_index | rs_deep_files_index { rs_deep_channels_index | rs_deep_files_index | rs_deep_forums_index {
mLibs += xapian mLibs += xapian
win32-g++|win32-clang-g++:mLibs += rpcrt4 win32-g++|win32-clang-g++:mLibs += rpcrt4
} }