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

Merge branch 'dev' into bugfix/wrong-fields-type-shadowsocks-config

Browse source
This commit is contained in:
pokamest 2023-02-09 13:10:26 +00:00
commit 1f048a6d04
10 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
set(PROJECT AmneziaVPN)
project(${PROJECT} VERSION 2.1.2)

2
client/protocols/openvpnovercloakprotocol.cpp
View file

@ -109,8 +109,6 @@ QString OpenVpnOverCloakProtocol::cloakExecPath()
{
#ifdef Q_OS_WIN
return Utils::executable(QString("cloak/ck-client"), true);
#elif defined Q_OS_LINUX
return Utils::usrExecutable("ck-client");
#else
return Utils::executable(QString("/ck-client"), true);
#endif

2
client/protocols/shadowsocksvpnprotocol.cpp
View file

@ -109,8 +109,6 @@ QString ShadowSocksVpnProtocol::shadowSocksExecPath()
{
#ifdef Q_OS_WIN
return Utils::executable(QString("ss/ss-local"), true);
#elif defined Q_OS_LINUX
return Utils::usrExecutable(QString("ss-local"));
#else
return Utils::executable(QString("/ss-local"), true);
#endif