OpenSSL for ASndroid added
This commit is contained in:
parent
78dec77c3c
commit
65d110eb0a
11 changed files with 17 additions and 21 deletions
BIN
client/3rd/OpenSSL/lib/android/arm/libcrypto.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/arm/libcrypto.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/arm/libssl.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/arm/libssl.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/arm64/libcrypto.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/arm64/libcrypto.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/arm64/libssl.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/arm64/libssl.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/x86/libcrypto.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/x86/libcrypto.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/x86/libssl.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/x86/libssl.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a
Normal file
Binary file not shown.
BIN
client/3rd/OpenSSL/lib/android/x86_64/libssl.a
Normal file
BIN
client/3rd/OpenSSL/lib/android/x86_64/libssl.a
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -133,13 +133,6 @@ RESOURCES += \
|
|||
TRANSLATIONS = \
|
||||
translations/amneziavpn_ru.ts
|
||||
|
||||
#CONFIG(release, debug|release) {
|
||||
# DESTDIR = $$PWD/../../AmneziaVPN-build/client/release
|
||||
# MOC_DIR = $$DESTDIR
|
||||
# OBJECTS_DIR = $$DESTDIR
|
||||
# RCC_DIR = $$DESTDIR
|
||||
#}
|
||||
|
||||
win32 {
|
||||
OTHER_FILES += platform_win/vpnclient.rc
|
||||
RC_FILE = platform_win/vpnclient.rc
|
||||
|
@ -167,11 +160,11 @@ win32 {
|
|||
|
||||
!contains(QMAKE_TARGET.arch, x86_64) {
|
||||
message("Windows x86 build")
|
||||
LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86/ -llibssl -llibcrypto -lopenssl
|
||||
LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86/ -llibssl -llibcrypto
|
||||
}
|
||||
else {
|
||||
message("Windows x86_64 build")
|
||||
LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86_64/ -llibssl -llibcrypto -lopenssl
|
||||
LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86_64/ -llibssl -llibcrypto
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -199,10 +192,8 @@ android {
|
|||
|
||||
HEADERS += protocols/android_vpnprotocol.h \
|
||||
|
||||
|
||||
SOURCES += protocols/android_vpnprotocol.cpp \
|
||||
|
||||
|
||||
DISTFILES += \
|
||||
android/AndroidManifest.xml \
|
||||
android/build.gradle \
|
||||
|
@ -219,6 +210,11 @@ android {
|
|||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
||||
|
||||
for (abi, ANDROID_ABIS): {
|
||||
equals(ANDROID_TARGET_ARCH,$$abi) {
|
||||
LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libcrypto.a
|
||||
LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libssl.a
|
||||
}
|
||||
|
||||
ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so
|
||||
ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so
|
||||
ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue