[perf] reduce desktop build dependencies and binary size

apps/desktop/src/common/task_queue_lock_free.cpp

@@ -1,5 +1,7 @@
 #include "task_queue_lock_free.h"
 
+#include <concurrentqueue.h>
+
 #include <exception>
 #include <new>
 #include <stdexcept>
@@ -7,8 +9,15 @@
 
 namespace crossdesk {
 
+struct TaskQueueLockFree::QueueStorage {
+  moodycamel::ConcurrentQueue<TaskItem> tasks;
+  // All submissions share one producer so different caller threads keep FIFO.
+  moodycamel::ProducerToken producer{tasks};
+};
+
 TaskQueueLockFree::TaskQueueLockFree()
-    : producer_(task_queue_), worker_([this] { WorkerThread(); }) {}
+    : queue_(std::make_unique<QueueStorage>()),
+      worker_([this] { WorkerThread(); }) {}
 
 TaskQueueLockFree::~TaskQueueLockFree() { Stop(); }
 
@@ -24,7 +33,7 @@ std::future<void> TaskQueueLockFree::PostTask(std::function<void()> task) {
 
     // Count before publishing: the worker may dequeue as soon as enqueue returns.
     ++pending_tasks_;
-    if (!task_queue_.enqueue(producer_, std::move(item))) {
+    if (!queue_->tasks.enqueue(queue_->producer, std::move(item))) {
       --pending_tasks_;
       throw std::bad_alloc();
     }
@@ -48,7 +57,7 @@ void TaskQueueLockFree::Stop() {
 void TaskQueueLockFree::WorkerThread() {
   while (true) {
     TaskItem item;
-    while (task_queue_.try_dequeue(item)) {
+    while (queue_->tasks.try_dequeue(item)) {
       --pending_tasks_;
 
       std::exception_ptr error;

apps/desktop/src/common/task_queue_lock_free.h

@@ -12,11 +12,10 @@
 #include <cstddef>
 #include <functional>
 #include <future>
+#include <memory>
 #include <mutex>
 #include <thread>
 
-#include <concurrentqueue.h>
-
 namespace crossdesk {
 
 // A single worker executes tasks in submission order. The concurrent queue
@@ -41,9 +40,8 @@ class TaskQueueLockFree {
 
   void WorkerThread();
 
-  moodycamel::ConcurrentQueue<TaskItem> task_queue_;
+  struct QueueStorage;
-  // All submissions share one producer so different caller threads keep FIFO.
+  std::unique_ptr<QueueStorage> queue_;
-  moodycamel::ProducerToken producer_;
   std::atomic<std::size_t> pending_tasks_{0};
   std::mutex mutex_;
   std::condition_variable wake_;

apps/desktop/src/config_center/config_center.cpp

@@ -2,15 +2,19 @@
 
 #include <algorithm>
 #include <chrono>
+#include <cstring>
 #include <filesystem>
 #include <optional>
 #include <vector>
 
+#include "SimpleIni.h"
 #include "autostart.h"
 #include "rd_log.h"
 
 namespace crossdesk {
 
+struct ConfigCenter::IniStorage : CSimpleIniA {};
+
 namespace {
 
 bool IsValidTurnModeValue(long value) {
@@ -21,15 +25,15 @@ bool IsValidTurnModeValue(long value) {
 }  // namespace
 
 ConfigCenter::ConfigCenter(const std::string& config_path)
-    : config_path_(config_path) {
+    : config_path_(config_path), ini_(std::make_unique<IniStorage>()) {
-  ini_.SetUnicode(true);
+  ini_->SetUnicode(true);
   Load();
 }
 
 ConfigCenter::~ConfigCenter() {}
 
 int ConfigCenter::Load() {
-  SI_Error rc = ini_.LoadFile(config_path_.c_str());
+  SI_Error rc = ini_->LoadFile(config_path_.c_str());
   if (rc < 0) {
     Save();
     return -1;
@@ -38,18 +42,18 @@ int ConfigCenter::Load() {
   bool persist_config_migration = false;
   // These options now belong only to the active remote connection. Discard
   // legacy local defaults so they cannot affect this host or new connections.
-  persist_config_migration |= ini_.Delete(section_, "video_quality");
+  persist_config_migration |= ini_->Delete(section_, "video_quality");
-  persist_config_migration |= ini_.Delete(section_, "video_frame_rate");
+  persist_config_migration |= ini_->Delete(section_, "video_frame_rate");
-  persist_config_migration |= ini_.Delete(section_, "video_adaptation_policy");
+  persist_config_migration |= ini_->Delete(section_, "video_adaptation_policy");
-  persist_config_migration |= ini_.Delete(section_, "video_content_type");
+  persist_config_migration |= ini_->Delete(section_, "video_content_type");
-  persist_config_migration |= ini_.Delete(section_, "screen_content");
+  persist_config_migration |= ini_->Delete(section_, "screen_content");
   persist_config_migration |=
-      ini_.Delete(section_, "enable_desktop_quality_optimization");
+      ini_->Delete(section_, "enable_desktop_quality_optimization");
   persist_config_migration |=
-      ini_.Delete(section_, "enable_minimize_to_tray");
+      ini_->Delete(section_, "enable_minimize_to_tray");
 
   const long language_value =
-      ini_.GetLongValue(section_, "language", static_cast<long>(language_));
+      ini_->GetLongValue(section_, "language", static_cast<long>(language_));
   if (language_value < static_cast<long>(LANGUAGE::CHINESE) ||
       language_value > static_cast<long>(LANGUAGE::RUSSIAN)) {
     language_ = LANGUAGE::ENGLISH;
@@ -57,7 +61,7 @@ int ConfigCenter::Load() {
     language_ = static_cast<LANGUAGE>(language_value);
   }
 
-  const long screen_capture_method_value = ini_.GetLongValue(
+  const long screen_capture_method_value = ini_->GetLongValue(
       section_, "screen_capture_method",
       static_cast<long>(ScreenCaptureMethod::Auto));
   screen_capture_method_ = IsValidScreenCaptureMethod(screen_capture_method_value)
@@ -66,14 +70,14 @@ int ConfigCenter::Load() {
                                : ScreenCaptureMethod::Auto;
 
   video_encode_format_ = static_cast<VIDEO_ENCODE_FORMAT>(
-      ini_.GetLongValue(section_, "video_encode_format",
+      ini_->GetLongValue(section_, "video_encode_format",
                         static_cast<long>(video_encode_format_)));
 
-  hardware_video_codec_ = ini_.GetBoolValue(section_, "hardware_video_codec",
+  hardware_video_codec_ = ini_->GetBoolValue(section_, "hardware_video_codec",
                                             hardware_video_codec_);
-  const char* turn_mode_value = ini_.GetValue(section_, "turn_mode", nullptr);
+  const char* turn_mode_value = ini_->GetValue(section_, "turn_mode", nullptr);
   if (turn_mode_value != nullptr && strlen(turn_mode_value) > 0) {
-    const long parsed_turn_mode = ini_.GetLongValue(
+    const long parsed_turn_mode = ini_->GetLongValue(
         section_, "turn_mode", static_cast<long>(turn_mode_));
     if (IsValidTurnModeValue(parsed_turn_mode)) {
       turn_mode_ = static_cast<TURN_MODE>(parsed_turn_mode);
@@ -83,24 +87,24 @@ int ConfigCenter::Load() {
       turn_mode_ = TURN_MODE::AUTO_UDP_TCP;
     }
   } else {
-    const bool legacy_enable_turn = ini_.GetBoolValue(
+    const bool legacy_enable_turn = ini_->GetBoolValue(
         section_, "enable_turn", turn_mode_ != TURN_MODE::DISABLED);
     turn_mode_ = legacy_enable_turn ? TURN_MODE::AUTO_UDP_TCP
                                     : TURN_MODE::DISABLED;
-    ini_.SetLongValue(section_, "turn_mode", static_cast<long>(turn_mode_));
+    ini_->SetLongValue(section_, "turn_mode", static_cast<long>(turn_mode_));
     persist_config_migration = true;
   }
   // Migrate the former user switch. Keep true in the file for older builds,
   // while the current application always requests encrypted native media.
-  if (!ini_.GetBoolValue(section_, "enable_srtp", false)) {
+  if (!ini_->GetBoolValue(section_, "enable_srtp", false)) {
-    ini_.SetBoolValue(section_, "enable_srtp", true);
+    ini_->SetBoolValue(section_, "enable_srtp", true);
     persist_config_migration = true;
   }
   enable_self_hosted_ =
-      ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
+      ini_->GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
 
   const char* signal_server_host_value =
-      ini_.GetValue(section_, "signal_server_host", nullptr);
+      ini_->GetValue(section_, "signal_server_host", nullptr);
   if (signal_server_host_value != nullptr &&
       strlen(signal_server_host_value) > 0) {
     signal_server_host_ = signal_server_host_value;
@@ -108,25 +112,25 @@ int ConfigCenter::Load() {
     signal_server_host_ = "";
   }
   const char* signal_server_port_value =
-      ini_.GetValue(section_, "signal_server_port", nullptr);
+      ini_->GetValue(section_, "signal_server_port", nullptr);
   if (signal_server_port_value != nullptr &&
       strlen(signal_server_port_value) > 0) {
     signal_server_port_ =
-        static_cast<int>(ini_.GetLongValue(section_, "signal_server_port", 0));
+        static_cast<int>(ini_->GetLongValue(section_, "signal_server_port", 0));
   } else {
     signal_server_port_ = 0;
   }
   enable_autostart_ =
-      ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
+      ini_->GetBoolValue(section_, "enable_autostart", enable_autostart_);
-  enable_daemon_ = ini_.GetBoolValue(section_, "enable_daemon", enable_daemon_);
+  enable_daemon_ = ini_->GetBoolValue(section_, "enable_daemon", enable_daemon_);
   enable_privacy_screen_.store(
-      ini_.GetBoolValue(section_, "enable_privacy_screen", true));
+      ini_->GetBoolValue(section_, "enable_privacy_screen", true));
   portable_service_prompt_suppressed_ =
-      ini_.GetBoolValue(section_, "portable_service_prompt_suppressed",
+      ini_->GetBoolValue(section_, "portable_service_prompt_suppressed",
                         portable_service_prompt_suppressed_);
 
   const char* file_transfer_save_path_value =
-      ini_.GetValue(section_, "file_transfer_save_path", nullptr);
+      ini_->GetValue(section_, "file_transfer_save_path", nullptr);
   if (file_transfer_save_path_value != nullptr &&
       strlen(file_transfer_save_path_value) > 0) {
     file_transfer_save_path_ = file_transfer_save_path_value;
@@ -149,7 +153,7 @@ int ConfigCenter::CommitIni() {
       std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()) +
       "-" + std::to_string(sequence++);
   std::error_code error;
-  if (ini_.SaveFile(temporary.c_str()) < 0) {
+  if (ini_->SaveFile(temporary.c_str()) < 0) {
     LOG_ERROR("Failed to write configuration: {}", config_path_);
     std::filesystem::remove(temporary, error);
     return -1;
@@ -174,46 +178,46 @@ int ConfigCenter::StoreValues(
     std::initializer_list<std::pair<const char*, std::string>> values) {
   std::vector<std::pair<const char*, std::optional<std::string>>> previous;
   for (const auto& value : values) {
-    const char* old = ini_.GetValue(section_, value.first, nullptr);
+    const char* old = ini_->GetValue(section_, value.first, nullptr);
     previous.emplace_back(value.first, old ? std::optional<std::string>(old) : std::nullopt);
-    ini_.SetValue(section_, value.first, value.second.c_str());
+    ini_->SetValue(section_, value.first, value.second.c_str());
   }
   if (CommitIni() == 0) return 0;
   for (const auto& value : previous) {
-    if (value.second) ini_.SetValue(section_, value.first, value.second->c_str());
+    if (value.second) ini_->SetValue(section_, value.first, value.second->c_str());
-    else ini_.Delete(section_, value.first);
+    else ini_->Delete(section_, value.first);
   }
   return -1;
 }
 
 int ConfigCenter::Save() {
-  ini_.SetLongValue(section_, "language", static_cast<long>(language_));
+  ini_->SetLongValue(section_, "language", static_cast<long>(language_));
-  ini_.SetLongValue(section_, "screen_capture_method",
+  ini_->SetLongValue(section_, "screen_capture_method",
                     static_cast<long>(screen_capture_method_));
-  ini_.SetLongValue(section_, "video_encode_format",
+  ini_->SetLongValue(section_, "video_encode_format",
                     static_cast<long>(video_encode_format_));
-  ini_.SetBoolValue(section_, "hardware_video_codec", hardware_video_codec_);
+  ini_->SetBoolValue(section_, "hardware_video_codec", hardware_video_codec_);
-  ini_.SetLongValue(section_, "turn_mode", static_cast<long>(turn_mode_));
+  ini_->SetLongValue(section_, "turn_mode", static_cast<long>(turn_mode_));
-  ini_.SetBoolValue(section_, "enable_turn",
+  ini_->SetBoolValue(section_, "enable_turn",
                     turn_mode_ != TURN_MODE::DISABLED);
-  ini_.SetBoolValue(section_, "enable_srtp", true);
+  ini_->SetBoolValue(section_, "enable_srtp", true);
-  ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
+  ini_->SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
 
   // only save when self hosted
   if (enable_self_hosted_) {
-    ini_.SetValue(section_, "signal_server_host", signal_server_host_.c_str());
+    ini_->SetValue(section_, "signal_server_host", signal_server_host_.c_str());
-    ini_.SetLongValue(section_, "signal_server_port",
+    ini_->SetLongValue(section_, "signal_server_port",
                       static_cast<long>(signal_server_port_));
   }
 
-  ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
+  ini_->SetBoolValue(section_, "enable_autostart", enable_autostart_);
-  ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
+  ini_->SetBoolValue(section_, "enable_daemon", enable_daemon_);
-  ini_.SetBoolValue(section_, "enable_privacy_screen",
+  ini_->SetBoolValue(section_, "enable_privacy_screen",
                     enable_privacy_screen_.load());
-  ini_.SetBoolValue(section_, "portable_service_prompt_suppressed",
+  ini_->SetBoolValue(section_, "portable_service_prompt_suppressed",
                     portable_service_prompt_suppressed_);
 
-  ini_.SetValue(section_, "file_transfer_save_path",
+  ini_->SetValue(section_, "file_transfer_save_path",
                 file_transfer_save_path_.c_str());
 
   SI_Error rc = CommitIni();
@@ -237,9 +241,9 @@ int ConfigCenter::SetScreenCaptureMethod(ScreenCaptureMethod method) {
   if (!IsValidScreenCaptureMethod(static_cast<long>(method))) {
     return -1;
   }
-  ini_.SetLongValue(section_, "screen_capture_method", static_cast<long>(method));
+  ini_->SetLongValue(section_, "screen_capture_method", static_cast<long>(method));
   if (CommitIni() < 0) {
-    ini_.SetLongValue(section_, "screen_capture_method",
+    ini_->SetLongValue(section_, "screen_capture_method",
                       static_cast<long>(screen_capture_method_));
     return -1;
   }
@@ -328,9 +332,9 @@ int ConfigCenter::SetDaemon(bool enabled) {
 int ConfigCenter::SetPrivacyScreen(bool enable_privacy_screen) {
   const bool previous = enable_privacy_screen_.load();
   if (previous == enable_privacy_screen) return 0;
-  ini_.SetBoolValue(section_, "enable_privacy_screen", enable_privacy_screen);
+  ini_->SetBoolValue(section_, "enable_privacy_screen", enable_privacy_screen);
   if (CommitIni() < 0) {
-    ini_.SetBoolValue(section_, "enable_privacy_screen", previous);
+    ini_->SetBoolValue(section_, "enable_privacy_screen", previous);
     LOG_ERROR("Failed to save automatic privacy screen preference");
     return -1;
   }
@@ -342,7 +346,7 @@ int ConfigCenter::SetPrivacyScreen(bool enable_privacy_screen) {
 
 int ConfigCenter::SetPortableServicePromptSuppressed(bool suppressed) {
   portable_service_prompt_suppressed_ = suppressed;
-  ini_.SetBoolValue(section_, "portable_service_prompt_suppressed",
+  ini_->SetBoolValue(section_, "portable_service_prompt_suppressed",
                     portable_service_prompt_suppressed_);
   SI_Error rc = CommitIni();
   if (rc < 0) {

apps/desktop/src/config_center/config_center.h

@@ -9,11 +9,11 @@
 
 #include <atomic>
 #include <initializer_list>
+#include <memory>
 #include <mutex>
 #include <utility>
 #include <string>
 
-#include "SimpleIni.h"
 #include "screen_capturer/screen_capture_method.h"
 
 namespace crossdesk {
@@ -80,7 +80,8 @@ class ConfigCenter {
   int StoreValues(std::initializer_list<std::pair<const char*, std::string>> values);
   mutable std::mutex file_path_mutex_;
   std::string config_path_;
-  CSimpleIniA ini_;
+  struct IniStorage;
+  std::unique_ptr<IniStorage> ini_;
   const char* section_ = "Settings";
 
   LANGUAGE language_ = LANGUAGE::CHINESE;

apps/desktop/src/gui/application/gui_application.cpp

@@ -5,6 +5,7 @@
 #include <SDL3/SDL.h>
 #include <openssl/rand.h>
 #include <slint.h>
+#include <nlohmann/json.hpp>
 #include <tinyfiledialogs.h>
 
 #include <algorithm>

apps/desktop/src/gui/features/clipboard/clipboard_controller.cpp

@@ -1,5 +1,9 @@
 #include "features/clipboard/clipboard_controller.h"
 
+#include <SDL3/SDL_clipboard.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_events.h>
+
 #include <cstring>
 #include <shared_mutex>
 #include <utility>

apps/desktop/src/gui/features/clipboard/clipboard_controller.h

@@ -1,7 +1,11 @@
-#ifndef CROSSDESK_GUI_CLIPBOARD_CONTROLLER_H_
+/*
-#define CROSSDESK_GUI_CLIPBOARD_CONTROLLER_H_
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-25
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
 
-#include <SDL3/SDL.h>
+#ifndef _CLIPBOARD_CONTROLLER_H_
+#define _CLIPBOARD_CONTROLLER_H_
 
 #include <atomic>
 #include <cstddef>
@@ -42,4 +46,4 @@ private:
 
 } // namespace crossdesk
 
-#endif // CROSSDESK_GUI_CLIPBOARD_CONTROLLER_H_
+#endif // _CLIPBOARD_CONTROLLER_H_

apps/desktop/src/gui/features/devices/session_device_manager.cpp

@@ -1,5 +1,9 @@
 #include "features/devices/session_device_manager.h"
 
+#include <SDL3/SDL_audio.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_init.h>
+
 #include <display_stream_id.h>
 #include <remote_action.h>
 
@@ -8,6 +12,8 @@
 #include <cstdlib>
 #include <utility>
 
+#include "device_controller_factory.h"
+#include "screen_capturer_factory.h"
 #include "platform.h"
 #include "rd_log.h"
 #include "runtime/gui_runtime.h"

apps/desktop/src/gui/features/devices/session_device_manager.h

@@ -8,8 +8,6 @@
 #define _SESSION_DEVICE_MANAGER_H_
 
 
-#include <SDL3/SDL.h>
-
 #include <atomic>
 #include <chrono>
 #include <cstddef>
@@ -22,14 +20,17 @@
 #include <remote_action.h>
 
 #include "device_controller.h"
-#include "device_controller_factory.h"
 #include "display_info.h"
-#include "screen_capturer_factory.h"
 #include "speaker_capture_controller.h"
 
+struct SDL_AudioStream;
+
 namespace crossdesk {
 
 class GuiRuntime;
+class DeviceControllerFactory;
+class ScreenCapturerFactory;
+class ScreenCapturer;
 
 // Owns media capture/playback and remote input devices for the active GUI
 // session. GuiRuntime supplies application intent; this class handles device

apps/desktop/src/gui/features/file_transfer/file_transfer_manager.h

@@ -12,7 +12,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "runtime/gui_state.h"
+#include "runtime/remote_session.h"
 
 namespace crossdesk {
 

apps/desktop/src/gui/rendering/slint_video_presenter.cpp

@@ -1,4 +1,5 @@
 #include "rendering/slint_video_presenter.h"
+#include "crossdesk_ui.h"
 
 #include <libyuv.h>
 #include <slint.h>

apps/desktop/src/gui/rendering/slint_video_presenter.h

@@ -14,7 +14,13 @@
 #include <string>
 #include <vector>
 
-#include "crossdesk_ui.h"
+namespace slint {
+template <typename T> class ComponentHandle;
+}
+
+namespace crossdesk::ui {
+class StreamWindow;
+}
 
 namespace crossdesk {
 

apps/desktop/src/gui/runtime/gui_runtime.cpp

@@ -1,5 +1,7 @@
 #include "runtime/gui_runtime.h"
 
+#include <SDL3/SDL_timer.h>
+
 #include <algorithm>
 #include <chrono>
 #include <cstring>

apps/desktop/src/gui/runtime/gui_runtime.h

@@ -8,6 +8,7 @@
 #define _GUI_RUNTIME_H_
 
 #include <atomic>
+#include <cstdint>
 #include <deque>
 #include <memory>
 #include <string>
@@ -44,8 +45,8 @@ class GuiRuntime : protected gui_detail::GuiState {
   GuiRuntime();
   ~GuiRuntime();
 
-  static void SdlCaptureAudioIn(void* userdata, Uint8* stream, int len);
+  static void SdlCaptureAudioIn(void* userdata, uint8_t* stream, int len);
-  static void SdlCaptureAudioOut(void* userdata, Uint8* stream, int len);
+  static void SdlCaptureAudioOut(void* userdata, uint8_t* stream, int len);
 
   int CreateConnectionPeer();
   int ConnectTo(const std::string& remote_id, const char* password,

apps/desktop/src/gui/runtime/peer_data_callbacks.cpp

@@ -1,3 +1,5 @@
+#include <SDL3/SDL_timer.h>
+
 #include "runtime/peer_event_handler.h"
 
 #include <remote_action.h>

apps/desktop/src/gui/runtime/privacy_runtime.cpp

@@ -1,3 +1,5 @@
+#include <SDL3/SDL_timer.h>
+
 /*
  * @Author: DI JUNKUN
  * @Date: 2026-09-11

apps/desktop/src/log/rd_log.cpp

@@ -1,6 +1,15 @@
 #include "rd_log.h"
 
+#include <chrono>
+#include <ctime>
 #include <filesystem>
+#include <iomanip>
+#include <mutex>
+#include <sstream>
+#include <vector>
+
+#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/sinks/stdout_color_sinks.h"
 
 namespace crossdesk {
 

apps/desktop/src/log/rd_log.h

@@ -7,20 +7,9 @@
 #ifndef _RD_LOG_H_
 #define _RD_LOG_H_
 
-#include <chrono>
-#include <iomanip>
-#include <iostream>
 #include <memory>
-#include <mutex>
-#include <sstream>
 #include <string>
-#include <vector>
 
-#include "spdlog/common.h"
-#include "spdlog/logger.h"
-#include "spdlog/sinks/base_sink.h"
-#include "spdlog/sinks/rotating_file_sink.h"
-#include "spdlog/sinks/stdout_color_sinks.h"
 #include "spdlog/spdlog.h"
 
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO

apps/desktop/src/platform/macos/gui/runtime/mac_permission_runtime.mm

@@ -1,5 +1,7 @@
 #include "runtime/gui_runtime.h"
 
+#include <SDL3/SDL_timer.h>
+
 #include "rd_log.h"
 
 #include <ApplicationServices/ApplicationServices.h>

apps/desktop/src/platform/windows/gui/runtime/windows_service_runtime.cpp

@@ -1,5 +1,7 @@
 #include "runtime/gui_runtime.h"
 
+#include <SDL3/SDL_timer.h>
+
 #include <remote_action.h>
 
 #include <algorithm>

apps/desktop/src/version_checker/version_checker.cpp

@@ -7,6 +7,7 @@
 #include "version_checker.h"
 
 #include <httplib.h>
+#include <nlohmann/json.hpp>
 
 #include "rd_log.h"
 

apps/desktop/src/version_checker/version_checker.h

@@ -7,7 +7,7 @@
 #ifndef _VERSION_CHECKER_H_
 #define _VERSION_CHECKER_H_
 
-#include <nlohmann/json.hpp>
+#include <nlohmann/json_fwd.hpp>
 #include <optional>
 #include <string>
 

apps/desktop/tests/version_checker_test.cpp

@@ -1,5 +1,6 @@
 #include "version_checker.h"
 
+#include <nlohmann/json.hpp>
 #include <iostream>
 #include <limits>
 #include <string>

apps/desktop/xmake/platform.lua

@@ -24,6 +24,20 @@ local function collect_dbus_arch_include_dirs()
 end
 
 function setup_platform_settings()
+    -- Discard unreferenced functions/data without the extra build cost of LTO.
+    -- Keep debug builds unchanged for predictable debugger behavior.
+    if is_mode("release") then
+        if is_os("macosx") then
+            add_ldflags("-Wl,-dead_strip")
+        elseif is_os("linux") then
+            add_cxflags("-ffunction-sections", "-fdata-sections")
+            add_ldflags("-Wl,--gc-sections")
+        elseif is_os("windows") then
+            add_cxflags("/Gy", "/Gw")
+            add_ldflags("/OPT:REF", "/OPT:ICF")
+        end
+    end
+
     if is_os("windows") then
         add_requires("libyuv", "miniaudio 0.11.21")
         add_defines("NOMINMAX")

apps/desktop/xmake/rules/slint.lua

@@ -1,53 +1,80 @@
 rule("slint")
     set_extensions(".slint")
 
-    on_config(function(target)
+    after_load(function(target)
-        local rule_name = "slint"
-        if target:rule("c++.build") then
-            local cpp_rule = target:rule("c++.build"):clone()
-            cpp_rule:add("deps", rule_name, {order = true})
-            target:rule_add(cpp_rule)
-        end
-
         local outputdir = path.join(target:autogendir(), "rules", "slint")
-        os.mkdir(outputdir)
         target:add("includedirs", outputdir, {public = true})
 
-        local sourcebatch = target:sourcebatches()[rule_name]
+        local sourcebatch = target:sourcebatches()["slint"]
-        if sourcebatch and sourcebatch.sourcefiles then
+        local outputs = {}
-            for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
+        for _, sourcefile in ipairs(sourcebatch and sourcebatch.sourcefiles or {}) do
-                -- Make the generated include discoverable during C++ dependency
+            local header = path.join(outputdir, path.basename(sourcefile) .. ".h")
-                -- scanning; the real contents are produced before compilation.
+            local sources = {}
-                os.touch(path.join(outputdir, path.basename(sourcefile) .. ".h"))
+            -- Slint supports moving definitions out of the header and splitting
+            -- them into independently compiled translation units.
+            for index = 1, 4 do
+                local cppfile = path.join(outputdir,
+                    path.basename(sourcefile) .. "_" .. index .. ".cpp")
+                table.insert(sources, cppfile)
+                target:add("files", cppfile, {always_added = true})
             end
+            outputs[sourcefile] = {header = header, sources = sources}
+        end
+        target:data_set("slint.outputs", outputs)
+    end)
+
+    on_config(function(target)
+        if target:rule("c++.build") then
+            local cpp_rule = target:rule("c++.build"):clone()
+            cpp_rule:add("deps", "slint", {order = true})
+            target:rule_add(cpp_rule)
         end
     end)
 
-    before_buildcmd_file(function(target, batchcmds, sourcefile, opt)
+    before_build_file(function(target, sourcefile, opt)
-        local package = assert(target:pkg("slint"), "the slint package is required by this target")
+        import("core.project.depend")
-        local compiler = path.join(package:installdir(), "bin", is_host("windows") and "slint-compiler.exe" or "slint-compiler")
+        import("core.tools.gcc.parse_deps", {alias = "parse_deps"})
-        local outputdir = path.join(target:autogendir(), "rules", "slint")
+        import("utils.progress")
-        local outputfile = path.join(outputdir, path.basename(sourcefile) .. ".h")
-        local depfile = outputfile .. ".d"
 
-        batchcmds:show_progress(opt.progress, "${color.build.object}generating.slint %s", sourcefile)
+        local package = assert(target:pkg("slint"), "the slint package is required by this target")
-        batchcmds:mkdir(outputdir)
+        local compiler = path.join(package:installdir(), "bin",
-        batchcmds:vrunv(compiler, {
+            is_host("windows") and "slint-compiler.exe" or "slint-compiler")
-            sourcefile,
+        local outputs = target:data("slint.outputs")[sourcefile]
-            "-f", "cpp",
+        local depfile = outputs.header .. ".d"
-            "-o", outputfile,
+        -- Slint writes the -o path literally into each generated #include.
-            "--depfile", depfile,
+        local argv = {sourcefile, "-f", "cpp", "-o", path.absolute(outputs.header),
-            "--style", "fluent",
+            "--depfile", depfile, "--style", "fluent",
-            "--embed-resources=embed-files",
+            "--embed-resources=embed-files", "--cpp-namespace", "crossdesk::ui"}
-            "--cpp-namespace", "crossdesk::ui"
+        local missing_output = not os.isfile(outputs.header)
-        })
+        for _, cppfile in ipairs(outputs.sources) do
-        -- The compiler's depfile is useful to external build systems, while
+            table.insert(argv, "--cpp-file")
-        -- xmake needs imported .slint files registered explicitly so editing a
+            table.insert(argv, path.absolute(cppfile))
-        -- component regenerates the umbrella header without a forced rebuild.
+            missing_output = missing_output or not os.isfile(cppfile)
-        for _, dependency in ipairs(os.files(path.join(path.directory(sourcefile), "*.slint"))) do
-            batchcmds:add_depfiles(dependency)
         end
-        batchcmds:set_depmtime(os.mtime(outputfile))
+
-        batchcmds:set_depcache(target:dependfile(outputfile))
+        local function dependencies()
+            local files = {sourcefile, compiler}
+            if os.isfile(depfile) then
+                -- Track imported components AND embedded images, including
+                -- resources outside the UI directory, using the compiler output.
+                table.join2(files, parse_deps(io.readfile(depfile, {continuation = "\\"})))
+            end
+            files = table.unique(files)
+            table.sort(files)
+            return files
+        end
+
+        local depopts = {dependfile = target:dependfile(outputs.header),
+            values = argv, files = dependencies(),
+            changed = target:is_rebuilt() or missing_output or not os.isfile(depfile)}
+        -- Slint preserves timestamps of unchanged outputs. Use the dependency
+        -- cache's successful-generation time, not the oldest output's time.
+        depend.on_changed(function()
+            progress.show(opt.progress, "${color.build.object}generating.slint %s", sourcefile)
+            os.mkdir(path.directory(outputs.header))
+            os.vrunv(compiler, argv)
+            -- Save the freshly discovered dependencies on the first build too.
+            depopts.files = dependencies()
+        end, depopts)
     end)
 rule_end()

apps/desktop/xmake/targets.lua

@@ -1,6 +1,4 @@
 function setup_targets()
-    add_packages("spdlog", "libsdl3", "nlohmann_json")
-
     includes("deps/submodules", "deps/thirdparty")
 
     local crossdesk_version = get_config("CROSSDESK_VERSION") or "0.0.0"
@@ -65,15 +63,17 @@ function setup_targets()
 
     target("rd_log")
         set_kind("object")
-        add_packages("spdlog")
+        add_packages("spdlog", {public = true})
         add_files("apps/desktop/src/log/rd_log.cpp")
         add_includedirs("apps/desktop/src/log", {public = true})
 
-    target("common")
+    -- MiniRTC owns a target named "common". Reusing it merges the two targets
+    -- and makes the media library inherit desktop sources and dependencies.
+    target("desktop_common")
         set_kind("object")
         add_deps("rd_log", "crossdesk_wire")
         add_packages("libyuv")
-        add_packages("concurrentqueue", {public = true})
+        add_packages("concurrentqueue")
         add_files("apps/desktop/src/common/*.cpp")
         if is_os("windows") then
             add_files("apps/desktop/src/platform/windows/system_info.cpp")
@@ -169,6 +169,21 @@ function setup_targets()
         add_includedirs("apps/desktop/src/platform/windows/service")
         add_files("apps/desktop/tests/windows_sas_guard_test.cpp")
 
+    target("crossdesk_ui")
+        set_kind("static")
+        set_languages("c++20")
+        -- Generated bindings are not the video/rendering hot path. Optimizing
+        -- them for size avoids expensive inlining of the large UI object tree.
+        if is_mode("release") then
+            set_optimize("smallest")
+        end
+        add_packages("slint", {public = true})
+        add_rules("slint")
+        add_files("apps/desktop/src/gui/ui/crossdesk_ui.slint")
+        if is_os("windows") then
+            add_cxxflags("/bigobj")
+        end
+
     target("slint_ui_smoke_test")
         set_kind("binary")
         set_languages("c++20")
@@ -177,17 +192,16 @@ function setup_targets()
             add_cxxflags("/bigobj")
         end
         add_packages("slint")
+        add_deps("crossdesk_ui")
         add_includedirs("apps/desktop/src/gui", "apps/desktop/src/gui/assets/fonts",
             "apps/desktop/src/gui/assets/localization")
-        add_rules("slint")
-        add_files("apps/desktop/src/gui/ui/crossdesk_ui.slint")
         add_files("apps/desktop/tests/slint_ui_smoke_test.cpp")
         after_build(copy_slint_runtime)
 
     target("version_checker_test")
         set_kind("binary")
         set_default(false)
-        add_packages("cpp-httplib")
+        add_packages("cpp-httplib", "nlohmann_json")
         add_deps("rd_log")
         add_includedirs("apps/desktop/src/version_checker")
         add_files("apps/desktop/tests/version_checker_test.cpp",
@@ -240,12 +254,12 @@ function setup_targets()
 
     target("screen_capturer")
         set_kind("object")
-        add_deps("rd_log", "common", "crossdesk_wire")
+        add_deps("rd_log", "desktop_common", "crossdesk_wire")
         add_includedirs("apps/desktop/src/screen_capturer", {public = true})
         add_includedirs("deps/submodules/minirtc/src/api", {public = true})
         if is_os("windows") then
             add_deps("privacy")
-            add_packages("libyuv")
+            add_packages("libyuv", "nlohmann_json")
             add_files("apps/desktop/src/screen_capturer/captured_nv12_frame.cpp")
             add_files("apps/desktop/src/platform/windows/screen_capturer/screen_capturer_dxgi.cpp",
                 "apps/desktop/src/platform/windows/screen_capturer/screen_capturer_gdi.cpp",
@@ -312,7 +326,7 @@ function setup_targets()
 
     target("device_controller")
         set_kind("object")
-        add_deps("rd_log", "common", "crossdesk_wire")
+        add_deps("rd_log", "desktop_common", "crossdesk_wire")
         add_includedirs("apps/desktop/src/device_controller", {public = true})
         add_includedirs("apps/desktop/src/platform/common/input")
         if is_os("windows") then
@@ -347,7 +361,7 @@ function setup_targets()
     target("thumbnail")
         set_kind("object")
         add_packages("libyuv", "openssl3")
-        add_deps("rd_log", "common")
+        add_deps("rd_log", "desktop_common")
         add_files("apps/desktop/src/thumbnail/*.cpp")
         add_includedirs("apps/desktop/src/thumbnail", {public = true})
 
@@ -380,6 +394,7 @@ function setup_targets()
     target("version_checker")
         set_kind("object")
         add_packages("cpp-httplib")
+        add_packages("nlohmann_json", {public = true})
         add_deps("rd_log")
         add_files("apps/desktop/src/version_checker/*.cpp")
         add_includedirs("apps/desktop/src/version_checker", {public = true})
@@ -390,7 +405,7 @@ function setup_targets()
 
     target("tools")
         set_kind("object")
-        add_deps("rd_log", "common", "crossdesk_wire")
+        add_deps("rd_log", "desktop_common", "crossdesk_wire")
         add_files("apps/desktop/src/tools/*.cpp")
         if is_os("windows") then
             add_files("apps/desktop/src/platform/windows/clipboard.cpp")
@@ -409,24 +424,23 @@ function setup_targets()
         -- version and use fmt's supported runtime-parser fallback here.
         add_defines("FMT_CONSTEVAL=")
         add_packages("slint", {public = true})
-        add_packages("libyuv", "tinyfiledialogs", "openssl3")
+        add_packages("libyuv", "tinyfiledialogs", "openssl3", "libsdl3", "nlohmann_json")
-        add_rules("slint")
         if is_config("CROSSDESK_PORTABLE", true) then
             -- RuntimeState changes layout in portable builds. Consumers of GUI
             -- headers must see the same definition, without affecting its deps.
             add_defines("CROSSDESK_PORTABLE=1", {public = true})
         end
-        add_deps("rd_log", "common", "assets", "config_center", "minirtc",
+        add_deps("rd_log", "desktop_common", "assets", "config_center", "minirtc",
             "path_manager", "screen_capturer", "speaker_capturer",
             "device_controller", "thumbnail", "version_checker", "tools",
-            "crossdesk_wire", "privacy")
+            "crossdesk_wire", "privacy", "crossdesk_ui")
         add_files("apps/desktop/src/gui/render.cpp", "apps/desktop/src/gui/application/gui_application.cpp",
             "apps/desktop/src/gui/rendering/*.cpp",
             "apps/desktop/src/gui/runtime/*.cpp",
             "apps/desktop/src/platform/common/gui/service_status_runtime.cpp",
             "apps/desktop/src/gui/features/devices/*.cpp", "apps/desktop/src/gui/features/input/*.cpp",
             "apps/desktop/src/gui/features/clipboard/*.cpp", "apps/desktop/src/gui/features/file_transfer/*.cpp",
-            "apps/desktop/src/gui/features/settings/*.cpp", "apps/desktop/src/gui/ui/crossdesk_ui.slint")
+            "apps/desktop/src/gui/features/settings/*.cpp")
         -- Only these translation units consume the application version. Keep
         -- version changes out of the flags for media and the rest of the GUI.
         add_files("apps/desktop/src/gui/application/gui_application.cpp",
@@ -494,6 +508,7 @@ function setup_targets()
 
         target("crossdesk_service")
             set_kind("binary")
+            add_packages("nlohmann_json")
             add_deps("rd_log", "path_manager")
             add_links("Advapi32", "Wtsapi32", "Ole32", "Userenv")
             add_files("apps/desktop/src/platform/windows/service/main.cpp",
@@ -505,7 +520,7 @@ function setup_targets()
 
         target("crossdesk_session_helper")
             set_kind("binary")
-            add_packages("libyuv")
+            add_packages("libyuv", "nlohmann_json")
             add_deps("rd_log", "path_manager")
             add_links("Advapi32", "User32", "Wtsapi32", "Gdi32", "Setupapi")
             add_files("apps/desktop/src/platform/windows/service/session_helper_main.cpp")
@@ -523,7 +538,7 @@ function setup_targets()
 
     target("crossdesk")
         set_kind("binary")
-        add_deps("rd_log", "common", "gui")
+        add_deps("rd_log", "desktop_common", "gui")
         add_files("apps/desktop/src/app/*.cpp")
         add_includedirs("apps/desktop/src", "apps/desktop/src/app", {public = true})
         if is_os("windows") then