Merge branch 'master' of github.com:ungive/loon

ungive · Sep 10, 2024 · 77f316d · 77f316d
2 parents 6917245 + 7cabac8
commit 77f316d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: ungive
+liberapay: jonasvandenberg
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -53,12 +53,12 @@ endif()
 # protobuf + protocol buffers
 set(Protobuf_USE_STATIC_LIBS ON CACHE BOOL "Override option" FORCE)
 find_package(Protobuf CONFIG REQUIRED)
-target_include_directories(loon PRIVATE ${Protobuf_INCLUDE_DIRS})
+target_include_directories(loon PRIVATE ${Protobuf_INCLUDE_DIRS} ${protobuf_INCLUDE_DIRS})
 target_include_directories(loon PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 configure_file(../api/messages.proto
                ${CMAKE_CURRENT_BINARY_DIR}/loon/messages.proto COPYONLY)
 add_library(loon_proto STATIC ${CMAKE_CURRENT_BINARY_DIR}/loon/messages.proto)
-target_include_directories(loon_proto PRIVATE ${Protobuf_INCLUDE_DIRS})
+target_include_directories(loon_proto PRIVATE ${Protobuf_INCLUDE_DIRS} ${protobuf_INCLUDE_DIRS})
 target_include_directories(loon_proto PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 protobuf_generate(
     LANGUAGE

diff --git a/client/src/request_handler.h b/client/src/request_handler.h
@@ -7,6 +7,7 @@
 #include <functional>
 #include <memory>
 #include <optional>
+#include <thread>
 
 #include "loon/client.h"
 #include "loon/messages.pb.h"

diff --git a/client/src/websocket/backend_qt.cpp b/client/src/websocket/backend_qt.cpp
@@ -338,7 +338,7 @@ void loon::websocket::log_handler(log_handler_t handler)
     _handler = handler;
 }
 
-static inline void log_message(loon::LogLevel level, std::string const& message)
+inline void log_message(loon::LogLevel level, std::string const& message)
 {
     const std::lock_guard<std::mutex> lock(_mutex);
     if (_handler) {

diff --git a/client/src/websocket/client.h b/client/src/websocket/client.h
@@ -174,9 +174,9 @@ class BaseClient : public IClient
     void on_message(
         std::function<void(std::string const& message)> callback) override;
 
-    virtual int64_t send_binary(const char* data, size_t length) = 0;
+    virtual int64_t send_binary(const char* data, size_t length) override = 0;
 
-    virtual int64_t send_text(const char* data, size_t length) = 0;
+    virtual int64_t send_text(const char* data, size_t length) override = 0;
 
     void start() override;