mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
OpenSSL for ASndroid added
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+7
-11
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user