AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenSSL for ASndroid added

Browse source
This commit is contained in:
pokamest 2021-10-18 18:49:15 +03:00
parent 78dec77c3c
commit 65d110eb0a
11 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
client/3rd/OpenSSL/lib/android/arm/libcrypto.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/arm/libssl.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/arm64/libcrypto.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/arm64/libssl.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/x86/libcrypto.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/x86/libssl.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/x86_64/libcrypto.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/android/x86_64/libssl.a Normal file
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/windows/x86/openssl.lib
View file

Binary file not shown.

BIN
client/3rd/OpenSSL/lib/windows/x86_64/openssl.lib
View file

Binary file not shown.

38
client/client.pro
View file

@ -133,13 +133,6 @@ RESOURCES += \
TRANSLATIONS = \ TRANSLATIONS = \
translations/amneziavpn_ru.ts translations/amneziavpn_ru.ts
#CONFIG(release, debug|release) {
# DESTDIR = $$PWD/../../AmneziaVPN-build/client/release
# MOC_DIR = $$DESTDIR
# OBJECTS_DIR = $$DESTDIR
# RCC_DIR = $$DESTDIR
#}
win32 { win32 {
OTHER_FILES += platform_win/vpnclient.rc OTHER_FILES += platform_win/vpnclient.rc
RC_FILE = platform_win/vpnclient.rc RC_FILE = platform_win/vpnclient.rc
@ -167,11 +160,11 @@ win32 {
!contains(QMAKE_TARGET.arch, x86_64) { !contains(QMAKE_TARGET.arch, x86_64) {
message("Windows x86 build") 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 { else {
message("Windows x86_64 build") 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 \ HEADERS += protocols/android_vpnprotocol.h \
SOURCES += protocols/android_vpnprotocol.cpp \ SOURCES += protocols/android_vpnprotocol.cpp \
DISTFILES += \ DISTFILES += \
android/AndroidManifest.xml \ android/AndroidManifest.xml \
android/build.gradle \ android/build.gradle \
@ -218,17 +209,22 @@ android {
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
for (abi, ANDROID_ABIS): { for (abi, ANDROID_ABIS): {
ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so equals(ANDROID_TARGET_ARCH,$$abi) {
ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libcrypto.a
ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so LIBS += $$PWD/3rd/OpenSSL/lib/android/$${abi}/libssl.a
}
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libjbcrypto.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopenvpn.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-go.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/wireguard/$${abi}/libwg-quick.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libjbcrypto.so
} ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopenvpn.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libopvpnutil.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpn3.so
ANDROID_EXTRA_LIBS += $$PWD/android/lib/openvpn/$${abi}/libovpnexec.so
}
} }
ios { ios {