diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-02-27 16:32:32 -0500 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-02-27 16:32:32 -0500 |
| commit | b2b60f8ade218920dc3eb5304e7abb7dfa9f3a8d (patch) | |
| tree | 23db862c08ca13d39961ce4693c713f7af610d95 | |
| parent | d03abe0db3c56502a1522230bc392f993447213d (diff) | |
| download | lingo-ap-tracker-b2b60f8ade218920dc3eb5304e7abb7dfa9f3a8d.tar.gz lingo-ap-tracker-b2b60f8ade218920dc3eb5304e7abb7dfa9f3a8d.tar.bz2 lingo-ap-tracker-b2b60f8ade218920dc3eb5304e7abb7dfa9f3a8d.zip | |
Fix websocketpp on gcc
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | vcpkg.json | 1 | ||||
| m--------- | vendor/vcpkg | 0 | ||||
| m--------- | vendor/websocketpp | 0 |
5 files changed, 4 insertions, 5 deletions
| diff --git a/.gitmodules b/.gitmodules index f25b54a..ebe016f 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -10,9 +10,6 @@ | |||
| 10 | [submodule "vendor/wswrap"] | 10 | [submodule "vendor/wswrap"] |
| 11 | path = vendor/wswrap | 11 | path = vendor/wswrap |
| 12 | url = https://github.com/black-sliver/wswrap.git | 12 | url = https://github.com/black-sliver/wswrap.git |
| 13 | [submodule "vendor/websocketpp"] | ||
| 14 | path = vendor/websocketpp | ||
| 15 | url = https://github.com/zaphoyd/websocketpp.git | ||
| 16 | [submodule "vendor/asio"] | 13 | [submodule "vendor/asio"] |
| 17 | path = vendor/asio | 14 | path = vendor/asio |
| 18 | url = https://github.com/chriskohlhoff/asio/ | 15 | url = https://github.com/chriskohlhoff/asio/ |
| diff --git a/CMakeLists.txt b/CMakeLists.txt index d82919a..a6f6342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -9,6 +9,7 @@ endif(MSVC) | |||
| 9 | find_package(wxWidgets CONFIG REQUIRED) | 9 | find_package(wxWidgets CONFIG REQUIRED) |
| 10 | find_package(OpenSSL REQUIRED) | 10 | find_package(OpenSSL REQUIRED) |
| 11 | find_package(yaml-cpp REQUIRED) | 11 | find_package(yaml-cpp REQUIRED) |
| 12 | find_package(websocketpp REQUIRED) | ||
| 12 | 13 | ||
| 13 | include_directories( | 14 | include_directories( |
| 14 | vendor/hkutil | 15 | vendor/hkutil |
| @@ -16,7 +17,7 @@ include_directories( | |||
| 16 | vendor/asio/asio/include | 17 | vendor/asio/asio/include |
| 17 | vendor/nlohmann | 18 | vendor/nlohmann |
| 18 | vendor/valijson/include | 19 | vendor/valijson/include |
| 19 | vendor/websocketpp | 20 | ${websocketpp_INCLUDE_DIRS} |
| 20 | vendor/wswrap/include | 21 | vendor/wswrap/include |
| 21 | ${yaml-cpp_INCLUDE_DIRS} | 22 | ${yaml-cpp_INCLUDE_DIRS} |
| 22 | ${OpenSSL_INCLUDE_DIRS} | 23 | ${OpenSSL_INCLUDE_DIRS} |
| @@ -46,4 +47,4 @@ add_executable(lingo_ap_tracker | |||
| 46 | ) | 47 | ) |
| 47 | set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 20) | 48 | set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 20) |
| 48 | set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD_REQUIRED ON) | 49 | set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD_REQUIRED ON) |
| 49 | target_link_libraries(lingo_ap_tracker PRIVATE OpenSSL::SSL OpenSSL::Crypto wx::core wx::base wx::net yaml-cpp) | 50 | target_link_libraries(lingo_ap_tracker PRIVATE OpenSSL::SSL OpenSSL::Crypto websocketpp::websocketpp wx::core wx::base wx::net yaml-cpp::yaml-cpp) |
| diff --git a/vcpkg.json b/vcpkg.json index 8ba54b0..925212a 100644 --- a/vcpkg.json +++ b/vcpkg.json | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "dependencies": [ | 2 | "dependencies": [ |
| 3 | "websocketpp", | ||
| 3 | "wxwidgets", | 4 | "wxwidgets", |
| 4 | "openssl", | 5 | "openssl", |
| 5 | "yaml-cpp" | 6 | "yaml-cpp" |
| diff --git a/vendor/vcpkg b/vendor/vcpkg | |||
| Subproject 6d69bbacd2fbeae957f034dbbd2b454b5e3941f | Subproject 3dd44b931481d7a8e9ba412621fa810232b6628 | ||
| diff --git a/vendor/websocketpp b/vendor/websocketpp deleted file mode 160000 | |||
| Subproject 1b11fd301531e6df35a6107c1e8665b1e77a2d8 | |||