iOS build fixes

client/3rd/QtSsh/src/botan/botan.pri

@@ -11,13 +11,11 @@ win32 {
        -lcrypt32 \
 
    !contains(QMAKE_TARGET.arch, x86_64) {
-      message("Windows x86 build")
       INCLUDEPATH += $$PWD/windows/x86_64
       HEADERS += $$PWD/windows/x86/botan_all.h
       SOURCES += $$PWD/windows/x86/botan_all.cpp
    }
    else {
-      message("Windows x86_64 build")
       INCLUDEPATH += $$PWD/windows/x86_64
       HEADERS += $$PWD/windows/x86_64/botan_all.h
       SOURCES += $$PWD/windows/x86_64/botan_all.cpp
@@ -25,14 +23,12 @@ win32 {
 }
 
 macx:!ios {
-    message("macOS build")
     INCLUDEPATH += $$PWD/macos
     HEADERS += $$PWD/macos/botan_all.h
     SOURCES += $$PWD/macos/botan_all.cpp
 }
 
 linux-g++ {
-    message("Linux build")
     INCLUDEPATH += $$PWD/linux
     HEADERS += $$PWD/linux/botan_all.h
     SOURCES += $$PWD/linux/botan_all.cpp
@@ -43,7 +39,6 @@ linux-g++ {
 android {
    for (abi, ANDROID_ABIS): {
       equals(ANDROID_TARGET_ARCH,$$abi) {
-         message("Android build for ANDROID_TARGET_ARCH" $$abi)
          INCLUDEPATH += $$PWD/android/$${abi}
          HEADERS += $$PWD/android/$${abi}/botan_all.h
          SOURCES += $$PWD/android/$${abi}/botan_all.cpp
@@ -52,8 +47,20 @@ android {
 }
 
 ios: {
-    message("ios build")
-    INCLUDEPATH += $$PWD/ios
-    HEADERS += $$PWD/ios/botan_all.h
-    SOURCES += $$PWD/ios/botan_all.cpp
+    CONFIG(iphoneos, iphoneos|iphonesimulator) {
+        contains(QT_ARCH, arm64) {
+            INCLUDEPATH += $$PWD/ios/iphone
+            HEADERS += $$PWD/ios/iphone/botan_all.h
+            SOURCES += $$PWD/ios/iphone/botan_all.cpp
+        } else {
+            message("Building for iOS/ARM v7 (32-bit) architecture")
+            ARCH_TAG = "ios_armv7"
+        }
+    }
+
+    CONFIG(iphonesimulator, iphoneos|iphonesimulator) {
+        INCLUDEPATH += $$PWD/ios/simulator
+        HEADERS += $$PWD/ios/simulator/botan_all.h
+        SOURCES += $$PWD/ios/simulator/botan_all.cpp
+    }
 }

client/client.pro

@@ -6,8 +6,6 @@ TEMPLATE = app
 
 CONFIG += qtquickcompiler
 
-ios:CONFIG += static
-
 DEFINES += QT_DEPRECATED_WARNINGS
 
 include("3rd/QtSsh/src/ssh/qssh.pri")
@@ -168,11 +166,11 @@ win32 {
 
 
    !contains(QMAKE_TARGET.arch, x86_64) {
-      # Windows x86
+      message("Windows x86 build")
       LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86/ -llibssl -llibcrypto -lopenssl
    }
    else {
-      # Windows x86_64
+      message("Windows x86_64 build")
       LIBS += -L$$PWD/3rd/OpenSSL/lib/windows/x86_64/ -llibssl -llibcrypto -lopenssl
    }
 }
@@ -217,6 +215,7 @@ android {
    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
    for (abi, ANDROID_ABIS): {
+      #message("Android build for ANDROID_TARGET_ARCH" $$abi)
       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
@@ -224,6 +223,52 @@ android {
 
 }
 
+ios {
+    message("Client ios build")
+    CONFIG += static
+
+    Q_ENABLE_BITCODE.value = NO
+    Q_ENABLE_BITCODE.name = ENABLE_BITCODE
+    QMAKE_MAC_XCODE_SETTINGS += Q_ENABLE_BITCODE
+
+    CONFIG(iphoneos, iphoneos|iphonesimulator) {
+        message("Building for iPhone OS")
+        QMAKE_TARGET_BUNDLE_PREFIX = org.amnezia
+        QMAKE_BUNDLE = AmneziaVPN
+        QMAKE_IOS_DEPLOYMENT_TARGET = 12.0
+        QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1
+        QMAKE_DEVELOPMENT_TEAM = X7UJ388FXK
+        QMAKE_PROVISIONING_PROFILE = f2fefb59-14aa-4aa9-ac14-1d5531b06dcc
+        QMAKE_XCODE_CODE_SIGN_IDENTITY = "Apple Distribution"
+
+        XCODEBUILD_FLAGS += -allowProvisioningUpdates
+
+        DEFINES += iphoneos
+
+        contains(QT_ARCH, arm64) {
+            message("Building for iOS/ARM v8 64-bit architecture")
+            ARCH_TAG = "ios_armv8_64"
+
+            LIBS += $$PWD/3rd/OpenSSL/lib/ios/iphone/libcrypto.a
+            LIBS += $$PWD/3rd/OpenSSL/lib/ios/iphone/libssl.a
+        } else {
+            message("Building for iOS/ARM v7 (32-bit) architecture")
+            ARCH_TAG = "ios_armv7"
+        }
+    }
+
+    CONFIG(iphonesimulator, iphoneos|iphonesimulator) {
+        message("Building for iPhone Simulator")
+        ARCH_TAG = "ios_x86_64"
+
+        DEFINES += iphonesimulator
+
+        LIBS += $$PWD/3rd/OpenSSL/lib/ios/simulator/libcrypto.a
+        LIBS += $$PWD/3rd/OpenSSL/lib/ios/simulator/libssl.a
+    }
+}
+
+
 REPC_REPLICA += ../ipc/ipc_interface.rep
 !ios: REPC_REPLICA += ../ipc/ipc_process_interface.rep