* refactoring: improved the performance of secure_settings * bugfix: fixed textFields on PageSetupWizardCredentials * bugfix: fixed scrolling by keys on PageSettingsApiServerInfo * chore: hide site links for ios (#1374) * chore: fixed log output with split tunneling info * chore: hide "open logs folder" button for mobule platforms * chore: fixed again log output with split tunneling info * chore: bump version * Install apparmor (#1379) Install apparmor * chore: returned the backup page for androidTV * Enable PFS for Windows IKEv2 * refactoring: moved api info pages from ServerInfo * refactoring: moved gateway interaction functions to a separate class * bugfix: fixed storeEndpoint parsing * chore: returned links for mobile platforms * Update VPN protocol descriptions * Update VPN description texts * feature: added pages for subscription settings feature * feature: added page for export api native configs * feature: added error handling and minor ui fixes * refactor: update ios build configuration to use automatic code signing and prebuilt OpenVPNAdapter framework * feat: remove OpenVPNAdapter submodule * feat: remove ios openvpn script and associated cmake configuration * Update README.md * Update README_RU.md * Update README.md fix link * feature: added share vpn key to subscription settings page * bugfix: fixed possible crush on android * add timeouts in ipc client init * apply timeouts only for Windows * apply format to file * refactoring: simplified the validity check of the config before connection - improved project structure * bugfix: fixed visability of share drawer * feature: added 409 error handling from server response * chore: fixed android build * chore: fixed qr code display * Rewrite timeouts using waitForSource * feature: added error messages handler * feature: added issued configs info parsing * feature: added functionality to revoke api configs * chore: added links to instructions * chore: fixed qr code with vpnkey processing * chore: fixed native config post processing * chore: added link to android tv instruction * change node to IpcProcessTun2SocksReplica * chore: minor ui fixes * Update Windows OpenSSL (#1426) * Update Windows OpenSSL to 3.0.16 and add shared library for QSslSocket plugin * chore: update link to submodule 3rd-prebuild --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> * chore: added 404 handling for revoke configs - added revoke before remove api server for premium v2 * chore: added log to see proxy decrypt errors * chore: minor ui fix * chore: bump version * bugfix: fixed mobile controllers initialization (#1436) * bugfix: fixed mobile controllers initialization * chore: bump version * Merge pull request #1440 from amnezia-vpn/feature/subscription-settings-page feature/subscription settings page --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> Co-authored-by: pokamest <pokamest@gmail.com> Co-authored-by: Mykola Baibuz <mykola.baibuz@gmail.com> Co-authored-by: Yaroslav Yashin <yaroslav.yashin@gmail.com> Co-authored-by: KsZnak <ksu@amnezia.org> Co-authored-by: Cyril Anisimov <CyAn84@gmail.com>
191 lines
6.6 KiB
CMake
191 lines
6.6 KiB
CMake
set(CLIENT_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/migrations.h
|
|
${CLIENT_ROOT_DIR}/../ipc/ipc.h
|
|
${CLIENT_ROOT_DIR}/amnezia_application.h
|
|
${CLIENT_ROOT_DIR}/containers/containers_defs.h
|
|
${CLIENT_ROOT_DIR}/core/defs.h
|
|
${CLIENT_ROOT_DIR}/core/errorstrings.h
|
|
${CLIENT_ROOT_DIR}/core/scripts_registry.h
|
|
${CLIENT_ROOT_DIR}/core/server_defs.h
|
|
${CLIENT_ROOT_DIR}/core/api/apiDefs.h
|
|
${CLIENT_ROOT_DIR}/core/qrCodeUtils.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/coreController.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/gatewayController.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/serverController.h
|
|
${CLIENT_ROOT_DIR}/core/controllers/vpnConfigurationController.h
|
|
${CLIENT_ROOT_DIR}/protocols/protocols_defs.h
|
|
${CLIENT_ROOT_DIR}/protocols/qml_register_protocols.h
|
|
${CLIENT_ROOT_DIR}/ui/pages.h
|
|
${CLIENT_ROOT_DIR}/ui/qautostart.h
|
|
${CLIENT_ROOT_DIR}/protocols/vpnprotocol.h
|
|
${CMAKE_CURRENT_BINARY_DIR}/version.h
|
|
${CLIENT_ROOT_DIR}/core/sshclient.h
|
|
${CLIENT_ROOT_DIR}/core/networkUtilities.h
|
|
${CLIENT_ROOT_DIR}/core/serialization/serialization.h
|
|
${CLIENT_ROOT_DIR}/core/serialization/transfer.h
|
|
${CLIENT_ROOT_DIR}/../common/logger/logger.h
|
|
${CLIENT_ROOT_DIR}/utils/qmlUtils.h
|
|
${CLIENT_ROOT_DIR}/core/api/apiUtils.h
|
|
)
|
|
|
|
# Mozilla headres
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/mozilla/models/server.h
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.h
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.h
|
|
${CLIENT_ROOT_DIR}/mozilla/controllerimpl.h
|
|
${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.h
|
|
)
|
|
|
|
if(NOT IOS)
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.h
|
|
)
|
|
endif()
|
|
|
|
if(NOT ANDROID)
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/ui/notificationhandler.h
|
|
)
|
|
endif()
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/migrations.cpp
|
|
${CLIENT_ROOT_DIR}/amnezia_application.cpp
|
|
${CLIENT_ROOT_DIR}/containers/containers_defs.cpp
|
|
${CLIENT_ROOT_DIR}/core/errorstrings.cpp
|
|
${CLIENT_ROOT_DIR}/core/scripts_registry.cpp
|
|
${CLIENT_ROOT_DIR}/core/server_defs.cpp
|
|
${CLIENT_ROOT_DIR}/core/qrCodeUtils.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/coreController.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/gatewayController.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/serverController.cpp
|
|
${CLIENT_ROOT_DIR}/core/controllers/vpnConfigurationController.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/protocols_defs.cpp
|
|
${CLIENT_ROOT_DIR}/ui/qautostart.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/vpnprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/core/sshclient.cpp
|
|
${CLIENT_ROOT_DIR}/core/networkUtilities.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/outbound.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/inbound.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/ss.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/ssd.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/vless.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/trojan.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/vmess.cpp
|
|
${CLIENT_ROOT_DIR}/core/serialization/vmess_new.cpp
|
|
${CLIENT_ROOT_DIR}/../common/logger/logger.cpp
|
|
${CLIENT_ROOT_DIR}/utils/qmlUtils.cpp
|
|
${CLIENT_ROOT_DIR}/core/api/apiUtils.cpp
|
|
)
|
|
|
|
# Mozilla sources
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/mozilla/models/server.cpp
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/ipaddress.cpp
|
|
${CLIENT_ROOT_DIR}/mozilla/shared/leakdetector.cpp
|
|
${CLIENT_ROOT_DIR}/mozilla/localsocketcontroller.cpp
|
|
)
|
|
|
|
if(NOT IOS)
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/platforms/ios/QRCodeReaderBase.cpp
|
|
)
|
|
endif()
|
|
|
|
if(NOT ANDROID)
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/ui/notificationhandler.cpp
|
|
)
|
|
endif()
|
|
|
|
file(GLOB COMMON_FILES_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/*.h)
|
|
file(GLOB COMMON_FILES_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/*.cpp)
|
|
|
|
file(GLOB_RECURSE PAGE_LOGIC_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_logic/*.h)
|
|
file(GLOB_RECURSE PAGE_LOGIC_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/ui/pages_logic/*.cpp)
|
|
|
|
file(GLOB CONFIGURATORS_H CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.h)
|
|
file(GLOB CONFIGURATORS_CPP CONFIGURE_DEPENDS ${CLIENT_ROOT_DIR}/configurators/*.cpp)
|
|
|
|
file(GLOB UI_MODELS_H CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/models/*.h
|
|
${CLIENT_ROOT_DIR}/ui/models/protocols/*.h
|
|
${CLIENT_ROOT_DIR}/ui/models/services/*.h
|
|
${CLIENT_ROOT_DIR}/ui/models/api/*.h
|
|
)
|
|
file(GLOB UI_MODELS_CPP CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/models/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/models/protocols/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/models/services/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/models/api/*.cpp
|
|
)
|
|
|
|
file(GLOB UI_CONTROLLERS_H CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/controllers/*.h
|
|
${CLIENT_ROOT_DIR}/ui/controllers/api/*.h
|
|
)
|
|
file(GLOB UI_CONTROLLERS_CPP CONFIGURE_DEPENDS
|
|
${CLIENT_ROOT_DIR}/ui/controllers/*.cpp
|
|
${CLIENT_ROOT_DIR}/ui/controllers/api/*.cpp
|
|
)
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${COMMON_FILES_H}
|
|
${PAGE_LOGIC_H}
|
|
${CONFIGURATORS_H}
|
|
${UI_MODELS_H}
|
|
${UI_CONTROLLERS_H}
|
|
)
|
|
set(SOURCES ${SOURCES}
|
|
${COMMON_FILES_CPP}
|
|
${PAGE_LOGIC_CPP}
|
|
${CONFIGURATORS_CPP}
|
|
${UI_MODELS_CPP}
|
|
${UI_CONTROLLERS_CPP}
|
|
)
|
|
|
|
if(WIN32)
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.h
|
|
)
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/protocols/ikev2_vpn_protocol_windows.cpp
|
|
)
|
|
|
|
set(RESOURCES ${RESOURCES}
|
|
${CMAKE_CURRENT_BINARY_DIR}/amneziavpn.rc
|
|
)
|
|
endif()
|
|
|
|
if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID))
|
|
message("Client desktop build")
|
|
add_compile_definitions(AMNEZIA_DESKTOP)
|
|
|
|
set(HEADERS ${HEADERS}
|
|
${CLIENT_ROOT_DIR}/core/ipcclient.h
|
|
${CLIENT_ROOT_DIR}/core/privileged_process.h
|
|
${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.h
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/shadowsocksvpnprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/xrayprotocol.h
|
|
${CLIENT_ROOT_DIR}/protocols/awgprotocol.h
|
|
)
|
|
|
|
set(SOURCES ${SOURCES}
|
|
${CLIENT_ROOT_DIR}/core/ipcclient.cpp
|
|
${CLIENT_ROOT_DIR}/core/privileged_process.cpp
|
|
${CLIENT_ROOT_DIR}/ui/systemtray_notificationhandler.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/openvpnovercloakprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/shadowsocksvpnprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/wireguardprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/xrayprotocol.cpp
|
|
${CLIENT_ROOT_DIR}/protocols/awgprotocol.cpp
|
|
)
|
|
endif()
|