diff options
| author | Salanto <62221668+Salanto@users.noreply.github.com> | 2022-06-06 10:14:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 19:14:44 +0200 |
| commit | f0a5e48f5ca6834c0f24b167c904a030894f706e (patch) | |
| tree | 0e7ae1497d0164e3a1a3c1d61a88e4f719beb5b5 /CMakeLists.txt | |
| parent | c4f459b6cce6382cbd7c1960a6738a5a8a45ab8c (diff) | |
Dual-Stack AO2 Client to handle both TCP and Websocket connections seemlessly (#696)
* Replace TCP Serversocket with Websocket
* Have TCP sockets live harmoniously with WS
"like 5 lines" yeah probably lost a bet.
* Update .gitlab-ci.yml
* hack to fix favorites
* Add support for websockets in the favorites list (serverlist.txt)
Make "add_favorite_server" remember the socket type
* Preserve old serverlist style
This will keep new entries compatible with 2.9 and prior clients. Makes parsing the list easier too.
* Add lookup table and correct write code to use lowercase
* I have no idea what a lookup table is, but this looks close enough
* Fix lookup table
* Otherwise backend selection behaviour is inverted
* clang-tidy had one job
* Yet it did not do it.
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
* const p_data
* Switch serverlist.txt to an ini format
* Fixes an Omni bug where : would split the servername
* Utilises internally QSettings properly for low parsing effort and clear structure
* Automatically migrates the legacy serverlist.txt to favorite_servers.ini
* Pleases my OCD
* Replace sample serverlist.
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: Alex Noir <Varsash@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 12a63c30..9d7714b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,10 @@ endif() target_include_directories(Attorney_Online PRIVATE include) # Target Lib -find_package(Qt5 COMPONENTS Core Gui Network Widgets Concurrent REQUIRED) +find_package(Qt5 COMPONENTS Core Gui Network Widgets Concurrent WebSockets REQUIRED) target_link_directories(Attorney_Online PRIVATE lib) target_link_libraries(Attorney_Online PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::Concurrent - bass bassmidi bassopus discord-rpc) + Qt5::WebSockets bass bassmidi bassopus discord-rpc) target_compile_definitions(Attorney_Online PRIVATE DISCORD) # Subdirectories |