diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp index 63a00e0b8..38d1ae688 100644 --- a/client/containers/containers_defs.cpp +++ b/client/containers/containers_defs.cpp @@ -148,7 +148,11 @@ bool ContainerProps::isWorkingOnPlatform(DockerContainer c) default: return false; } #elif defined (Q_OS_MAC) - return false; + switch (c) { + case DockerContainer::WireGuard: return false; + case DockerContainer::Ipsec: return false; + default: return true; + } #elif defined (Q_OS_ANDROID) switch (c) { diff --git a/client/protocols/vpnprotocol.cpp b/client/protocols/vpnprotocol.cpp index c64cff90a..2d304cdf7 100644 --- a/client/protocols/vpnprotocol.cpp +++ b/client/protocols/vpnprotocol.cpp @@ -103,12 +103,14 @@ QString VpnProtocol::vpnGateway() const VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject& configuration) { switch (container) { +#if defined(Q_OS_WINDOWS) + case DockerContainer::Ipsec: return new Ikev2Protocol(configuration); +#endif #if defined(Q_OS_WINDOWS) || defined(Q_OS_MACX) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) case DockerContainer::OpenVpn: return new OpenVpnProtocol(configuration); case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration); case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration); case DockerContainer::WireGuard: return new WireguardProtocol(configuration); - case DockerContainer::Ipsec: return new Ikev2Protocol(configuration); #endif default: return nullptr; } diff --git a/deploy/build_macos_notarized.sh b/deploy/build_macos_notarized.sh index 7c7a94903..2133286b6 100755 --- a/deploy/build_macos_notarized.sh +++ b/deploy/build_macos_notarized.sh @@ -64,7 +64,7 @@ echo "Packaging ..." #cd $DEPLOY_DIR -$QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite +$QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite -qmldir=$PROJECT_DIR cp -av $BUILD_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post_uninstall.sh diff --git a/service/service.pro b/service/service.pro index e89166db1..4c9a05368 100644 --- a/service/service.pro +++ b/service/service.pro @@ -4,7 +4,7 @@ include(common.pri) qtservice-uselib:SUBDIRS=buildlib SUBDIRS+=server - win32 { - SUBDIRS+=wireguard-service - } +} +win32 { + SUBDIRS+=wireguard-service }