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

libretroshare android move openssl static linking in more appropriated place

Browse source
This commit is contained in:
Gio 2016-08-23 12:27:04 +02:00
parent 85461825ce
commit 47944b30e6
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libretroshare/src/libretroshare.pro
View file

@ -338,10 +338,22 @@ haiku-* {
################################# Android ##################################### ################################# Android #####################################
android-g++ { android-g++ {
## ifaddrs is missing on Android add them ## ifaddrs is missing on Android add them
## taken from https://github.com/morristech/android-ifaddrs ## taken from https://github.com/morristech/android-ifaddrs
HEADERS *= util/ifaddrs.h HEADERS *= util/ifaddrs.h
SOURCES *= util/ifaddrs.c 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 ################################## ################################### COMMON stuff ##################################
@ -880,17 +892,3 @@ test_bitdht {
# ENABLED UDP NOW. # 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
}