diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index a1b2b9f47..1b41ec215 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -338,10 +338,22 @@ haiku-* { ################################# Android ##################################### android-g++ { - ## ifaddrs is missing on Android add them - ## taken from https://github.com/morristech/android-ifaddrs +## 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 ################################## @@ -880,17 +892,3 @@ test_bitdht { # ENABLED UDP NOW. } - -android-g++ { -## 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 -}