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

Macos build fixes

Browse source
This commit is contained in:
pokamest 2022-01-23 15:25:53 -08:00
parent daf53226c3
commit 8e26da1759
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/containers/containers_defs.cpp
View file

@ -148,7 +148,11 @@ bool ContainerProps::isWorkingOnPlatform(DockerContainer c)
default: return false; default: return false;
} }
#elif defined (Q_OS_MAC) #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) #elif defined (Q_OS_ANDROID)
switch (c) { switch (c) {

4
client/protocols/vpnprotocol.cpp
View file

@ -103,12 +103,14 @@ QString VpnProtocol::vpnGateway() const
VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject& configuration) VpnProtocol *VpnProtocol::factory(DockerContainer container, const QJsonObject& configuration)
{ {
switch (container) { 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)) #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::OpenVpn: return new OpenVpnProtocol(configuration);
case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration); case DockerContainer::Cloak: return new OpenVpnOverCloakProtocol(configuration);
case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration); case DockerContainer::ShadowSocks: return new ShadowSocksVpnProtocol(configuration);
case DockerContainer::WireGuard: return new WireguardProtocol(configuration); case DockerContainer::WireGuard: return new WireguardProtocol(configuration);
case DockerContainer::Ipsec: return new Ikev2Protocol(configuration);
#endif #endif
default: return nullptr; default: return nullptr;
} }

2
deploy/build_macos_notarized.sh
View file

@ -64,7 +64,7 @@ echo "Packaging ..."
#cd $DEPLOY_DIR #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 -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 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 rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post_uninstall.sh

6
service/service.pro
View file

@ -4,7 +4,7 @@
include(common.pri) include(common.pri)
qtservice-uselib:SUBDIRS=buildlib qtservice-uselib:SUBDIRS=buildlib
SUBDIRS+=server SUBDIRS+=server
win32 { }
SUBDIRS+=wireguard-service win32 {
} SUBDIRS+=wireguard-service
} }