fix cmake compile

mehah · Nov 29, 2024 · d13c1be · d13c1be
1 parent 4c0f7b3
commit d13c1be
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -290,8 +290,6 @@ set(SOURCE_FILES
 	framework/platform/unixplatform.cpp
 	framework/platform/win32crashhandler.cpp
 	framework/platform/win32platform.cpp
-	framework/proxy/proxy.cpp
-	framework/proxy/proxy_client.cpp
 	framework/stdext/demangle.cpp
 	framework/stdext/math.cpp
 	framework/stdext/net.cpp
@@ -301,6 +299,8 @@ set(SOURCE_FILES
 	framework/stdext/qrcodegen.cpp
 	framework/util/color.cpp
 	framework/util/crypt.cpp
+	framework/proxy/proxy.cpp
+	framework/proxy/proxy_client.cpp
 
 	client/animatedtext.cpp
 	client/animator.cpp

diff --git a/src/framework/proxy/proxy.cpp b/src/framework/proxy/proxy.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "proxy.h"
-#include <framework/global.h>
-#include <framework/stdext/stdext.h>
+
+#include "proxy_client.h"
 
 ProxyManager g_proxy;
 
@@ -177,4 +177,4 @@ int ProxyManager::getPing()
         }
     }
     return ret;
-}
+}
diff --git a/src/framework/proxy/proxy.h b/src/framework/proxy/proxy.h
@@ -22,13 +22,19 @@
 
 #pragma once
 
-#include "proxy_client.h"
+#include <asio.hpp>
 
-class ProxyManager {
+class Proxy;
+class Session;
+
+using ProxyPacket = std::vector<uint8_t>;
+using ProxyPacketPtr = std::shared_ptr<ProxyPacket>;
+
+class ProxyManager
+{
 public:
     ProxyManager() : m_io(), m_guard(asio::make_work_guard(m_io))
     {
-
     }
     void init();
     void terminate();

diff --git a/src/framework/proxy/proxy_client.cpp b/src/framework/proxy/proxy_client.cpp
@@ -22,10 +22,6 @@
 
 //#define PROXY_DEBUG
 
-#include <iostream>
-#include <sstream>
-#include <framework/global.h>
-
 #include "proxy_client.h"
 
 std::map<uint32_t, std::weak_ptr<Session>> g_sessions;

diff --git a/src/framework/proxy/proxy_client.h b/src/framework/proxy/proxy_client.h
@@ -22,21 +22,6 @@
 
 #pragma once
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x501
-#endif
-
-#include <chrono>
-#include <cstdint>
-#include <functional>
-#include <list>
-#include <map>
-#include <memory>
-#include <random>
-#include <set>
-#include <string>
-#include <thread>
-#include <vector>
 #include <asio.hpp>
 
 using ProxyPacket = std::vector<uint8_t>;
@@ -45,10 +30,12 @@ using ProxyPacketPtr = std::shared_ptr<ProxyPacket>;
 class Session;
 using SessionPtr = std::shared_ptr<Session>;
 
-class Proxy : public std::enable_shared_from_this<Proxy> {
+class Proxy : public std::enable_shared_from_this<Proxy>
+{
     static constexpr int CHECK_INTERVAL = 2500; // also timeout for ping
     static constexpr int BUFFER_SIZE = 65535;
-    enum ProxyState {
+    enum ProxyState
+    {
         STATE_NOT_CONNECTED,
         STATE_CONNECTING,
         STATE_CONNECTING_WAIT_FOR_PING,
@@ -126,7 +113,8 @@ class Proxy : public std::enable_shared_from_this<Proxy> {
 
 using ProxyPtr = std::shared_ptr<Proxy>;
 
-class Session : public std::enable_shared_from_this<Session> {
+class Session : public std::enable_shared_from_this<Session>
+{
     static constexpr int CHECK_INTERVAL = 500;
     static constexpr int BUFFER_SIZE = 65535;
     static constexpr int TIMEOUT = 30000;