Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-04 23:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'manu/android-frontend' into android

Browse source
This commit is contained in:
Gio 2016-09-04 15:25:25 +02:00
commit c6ec085519
29 changed files with 886 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

43
libretroshare/src/libretroshare.pro
View file

@ -335,27 +335,6 @@ haiku-* {
DESTDIR = lib
}
################################# Android #####################################
android-g++ {
## ifaddrs is missing on Android add them
## taken from https://github.com/morristech/android-ifaddrs
HEADERS *= util/ifaddrs.h
SOURCES *= util/ifaddrs.c
## Add this here and not in retroshare.pri because static library are very
## sensible to order in command line
LIBS += -L$$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/ -lssl
INCLUDEPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
DEPENDPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
PRE_TARGETDEPS += $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libssl.a
LIBS += -L$$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/ -lcrypto
INCLUDEPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
DEPENDPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
PRE_TARGETDEPS += $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libcrypto.a
}
################################### COMMON stuff ##################################
# openpgpsdk
@ -892,3 +871,25 @@ test_bitdht {
# ENABLED UDP NOW.
}
################################# Android #####################################
android-g++ {
## ifaddrs is missing on Android add them
## taken from https://github.com/morristech/android-ifaddrs
HEADERS *= util/ifaddrs.h
SOURCES *= util/ifaddrs.c
## Add this here and not in retroshare.pri because static library are very
## sensible to order in command line, has to be in the end of file for the
## same reason
LIBS += -L$$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/ -lssl
INCLUDEPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
DEPENDPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
PRE_TARGETDEPS += $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libssl.a
LIBS += -L$$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/ -lcrypto
INCLUDEPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
DEPENDPATH += $$NDK_TOOLCHAIN_PATH/sysroot/usr/include
PRE_TARGETDEPS += $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libcrypto.a
}