some more windows support change

Author: xianshijing-lk

CMakeLists.txt

@@ -6,6 +6,11 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+if(MSVC)
+  # Release: the prebuilt webrtc is using /MT, so we need to match that
+  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" CACHE STRING "" FORCE)
+endif()
+
 ############## Protobuf ################
 
 # ---- Protobuf (FFI protos) ----
@@ -27,7 +32,13 @@ set(FFI_PROTO_FILES
 set(PROTO_BINARY_DIR ${CMAKE_BINARY_DIR}/generated)
 file(MAKE_DIRECTORY ${PROTO_BINARY_DIR})
 
-find_package(Protobuf REQUIRED)
+find_package(Protobuf CONFIG REQUIRED)
+#if(MSVC)
+#set(Protobuf_PROTOC_EXECUTABLE
+#  "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc.exe"
+#  CACHE FILEPATH "" FORCE)
+#endif()
+find_package(absl CONFIG REQUIRED)
 
 # Object library that owns generated .pb.cc/.pb.h
 add_library(livekit_proto OBJECT ${FFI_PROTO_FILES})
@@ -307,7 +318,7 @@ endif()
 endif()
 
 # Only Protobuf >= 6 needs Abseil
-if (Protobuf_VERSION VERSION_GREATER_EQUAL 6.0)
+#if (Protobuf_VERSION VERSION_GREATER_EQUAL 6.0)
   # Some distros export as "Abseil::"
   find_package(absl CONFIG QUIET)
   if (NOT absl_FOUND)
@@ -334,9 +345,9 @@ if (Protobuf_VERSION VERSION_GREATER_EQUAL 6.0)
       "Install Abseil (macOS: 'brew install abseil', Ubuntu: 'sudo apt-get install libabsl-dev'), "
       "or use Protobuf < 6.")
   endif()
-else()
-  message(STATUS "Protobuf < 6 detected; skipping Abseil linking.")
-endif()
+#else()
+#  message(STATUS "Protobuf < 6 detected; skipping Abseil linking.")
+#endif()
 
 # On Linux, it needs to link OpenSSL
 if(UNIX AND NOT APPLE)

README.md

@@ -9,7 +9,8 @@ This SDK enables native C++ applications to connect to LiveKit servers for real-
 - **Rust / Cargo** (latest stable toolchain)  
 - **Protobuf** compiler (`protoc`)  
 - **macOS** users: System frameworks (CoreAudio, AudioToolbox, etc.) are automatically linked via CMake.
-- **windows** users: Ninja, 
+- **windows** users: Ninja, Visual Studio 2022 Build Tools (MSVC toolset + Windows SDK), Rust stable (MSVC toolchain) + Cargo,
+  vcpkg (recommended dependency manager on Windows) and install protobuf package via vcpkg
 - **Git LFS** (required for examples)
   Some example data files (e.g., audio assets) are stored using Git LFS.
   You must install Git LFS before cloning or pulling the repo if you want to run the examples.
@@ -32,13 +33,29 @@ git submodule update --init --recursive
 ## ⚙️ BUILD
 
 All build actions are managed by the provided build.sh script.
+**UNIX**
 ```bash
 ./build.sh clean        # Clean CMake build artifacts
 ./build.sh clean-all    # Deep clean (C++ + Rust + generated files)
 ./build.sh debug        # Build Debug version
 ./build.sh release      # Build Release version
 ./build.sh verbose      # Verbose build output
 ```
+**Windows**
+```bash
+cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE="$PWD/vcpkg/scripts/buildsystems/vcpkg.cmake"  # Generate Makefiles in build folder
+# Build (Release or Debug)
+cmake --build build --config Release
+# or:
+cmake --build build --config Debug
+# Clean CMake build artifacts
+Remove-Item -Recurse -Force build
+```
+Note (Windows), This assumes vcpkg is checked out in the repo root at .\vcpkg\.
+You must install protobuf via vcpkg (so CMake can find ProtobufConfig.cmake and protoc), for example:
+```bash
+.\vcpkg\vcpkg install protobuf:x64-windows
+```
 
 ## 🧪 Run Example
 

examples/CMakeLists.txt

@@ -1,74 +1,91 @@
 cmake_minimum_required(VERSION 3.31.0)
-project (livekit-examples)
+project(livekit-examples)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-#################### SimpleRoom example ##########################
+include(FetchContent)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(sdl3)
+set(SDL_TEST OFF CACHE BOOL "" FORCE)
+set(SDL_TESTS OFF CACHE BOOL "" FORCE)
+set(SDL_INSTALL OFF CACHE BOOL "" FORCE)
+set(SDL_EXAMPLES OFF CACHE BOOL "" FORCE)
 
-add_executable(SimpleRoom
-    simple_room/main.cpp
-    simple_room/fallback_capture.cpp
-    simple_room/fallback_capture.h
-    simple_room/sdl_media.cpp
-    simple_room/sdl_media.h
-    simple_room/sdl_media_manager.cpp
-    simple_room/sdl_media_manager.h
-    simple_room/sdl_video_renderer.cpp
-    simple_room/sdl_video_renderer.h
-    simple_room/wav_audio_source.cpp
-    simple_room/wav_audio_source.h
+FetchContent_Declare(
+  SDL3
+  GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
+  GIT_TAG release-3.2.0
 )
+FetchContent_MakeAvailable(SDL3)
 
-target_link_libraries(SimpleRoom
-    PRIVATE
-        livekit
-        SDL3::SDL3
+function(livekit_windows_link_deps target)
+  if (WIN32)
+    target_link_libraries(${target} PRIVATE
+      ntdll
+      userenv
+      winmm
+      iphlpapi
+      ole32
+      uuid
+      msdmo
+      dmoguids
+      strmiids
+      wmcodecdspuuid
+      ws2_32
+      bcrypt
+    )
+  endif()
+endfunction()
+
+add_executable(SimpleRoom
+  simple_room/main.cpp
+  simple_room/fallback_capture.cpp
+  simple_room/fallback_capture.h
+  simple_room/sdl_media.cpp
+  simple_room/sdl_media.h
+  simple_room/sdl_media_manager.cpp
+  simple_room/sdl_media_manager.h
+  simple_room/sdl_video_renderer.cpp
+  simple_room/sdl_video_renderer.h
+  simple_room/wav_audio_source.cpp
+  simple_room/wav_audio_source.h
 )
 
+target_link_libraries(SimpleRoom PRIVATE livekit SDL3::SDL3)
+livekit_windows_link_deps(SimpleRoom)
+
 add_custom_command(TARGET SimpleRoom POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${CMAKE_SOURCE_DIR}/data
-            ${CMAKE_CURRENT_BINARY_DIR}/data
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+          ${CMAKE_SOURCE_DIR}/data
+          ${CMAKE_CURRENT_BINARY_DIR}/data
 )
 
-#################### SimpleRpc example ##########################
-
-include(FetchContent)
 FetchContent_Declare(
   nlohmann_json
   URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
 )
 FetchContent_MakeAvailable(nlohmann_json)
 
-add_executable(SimpleRpc
-  simple_rpc/main.cpp
-)
-
-target_link_libraries(SimpleRpc
-  PRIVATE
-    nlohmann_json::nlohmann_json
-    livekit
-)
+add_executable(SimpleRpc simple_rpc/main.cpp)
+target_link_libraries(SimpleRpc PRIVATE nlohmann_json::nlohmann_json livekit)
+livekit_windows_link_deps(SimpleRpc)
 
-#################### SimpleDataStream example ##########################
-
-add_executable(SimpleDataStream
-  simple_data_stream/main.cpp
-)
+add_executable(SimpleDataStream simple_data_stream/main.cpp)
+target_link_libraries(SimpleDataStream PRIVATE livekit)
+livekit_windows_link_deps(SimpleDataStream)
 
-target_link_libraries(SimpleDataStream
-  PRIVATE
-    livekit
-)
-
-add_custom_command(
-  TARGET SimpleDataStream
-  POST_BUILD
+add_custom_command(TARGET SimpleDataStream POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory
           ${CMAKE_SOURCE_DIR}/data
           $<TARGET_FILE_DIR:SimpleDataStream>/data
-)
+)
+
+if (WIN32 AND TARGET SDL3::SDL3)
+  foreach(tgt SimpleRoom SimpleRpc SimpleDataStream)
+    add_custom_command(TARGET ${tgt} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+              $<TARGET_FILE:SDL3::SDL3>
+              $<TARGET_FILE_DIR:${tgt}>
+    )
+  endforeach()
+endif()

examples/simple_data_stream/main.cpp

@@ -7,6 +7,7 @@
 #include <map>
 #include <optional>
 #include <random>
+#include <sstream>
 #include <string>
 #include <thread>
 #include <vector>

examples/simple_room/fallback_capture.cpp

@@ -16,7 +16,11 @@
 
 #include "fallback_capture.h"
 
+#include <array>
+#include <atomic>
 #include <chrono>
+#include <cstdint>
+#include <iostream>
 #include <thread>
 
 #include "livekit/livekit.h"