diff --git a/src/single_window/render.h b/src/single_window/render.h index 2ea90f4..03a4493 100644 --- a/src/single_window/render.h +++ b/src/single_window/render.h @@ -16,7 +16,6 @@ #include #include -#include "../../thirdparty/projectx/src/interface/x.h" #include "IconsFontAwesome6.h" #include "config_center.h" #include "device_controller_factory.h" @@ -24,6 +23,7 @@ #include "imgui_impl_sdl2.h" #include "imgui_impl_sdlrenderer2.h" #include "imgui_internal.h" +#include "minirtc.h" #include "screen_capturer_factory.h" #include "speaker_capturer_factory.h" #include "thumbnail.h" diff --git a/thirdparty/minirtc b/thirdparty/minirtc index 1c0874f..3317657 160000 --- a/thirdparty/minirtc +++ b/thirdparty/minirtc @@ -1 +1 @@ -Subproject commit 1c0874f4eac8aecde7beef429b7e299cbaf81d09 +Subproject commit 331765760243f5ab817dc085fa3ab3ef4ba9da8b diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua index f5fcab0..bb10d29 100644 --- a/thirdparty/xmake.lua +++ b/thirdparty/xmake.lua @@ -1 +1 @@ -includes("projectx") \ No newline at end of file +includes("minirtc") \ No newline at end of file diff --git a/xmake.lua b/xmake.lua index c4a4fec..40af1f6 100644 --- a/xmake.lua +++ b/xmake.lua @@ -29,7 +29,7 @@ if is_os("windows") then elseif is_os("linux") then add_requires("libyuv") add_syslinks("pthread", "dl") - add_linkdirs("thirdparty/projectx/thirdparty/nvcodec/lib/x64") + add_linkdirs("thirdparty/minirtc/thirdparty/nvcodec/lib/x64") add_links("SDL2", "cuda", "nvidia-encode", "nvcuvid", "X11", "Xtst", "Xrandr") add_cxflags("-Wno-unused-variable") elseif is_os("macosx") then @@ -124,7 +124,7 @@ target("localization") target("single_window") set_kind("object") add_packages("libyuv", "openssl3") - add_deps("rd_log", "common", "localization", "config_center", "projectx", + add_deps("rd_log", "common", "localization", "config_center", "minirtc", "screen_capturer", "speaker_capturer", "device_controller") add_files("src/single_window/*.cpp") add_includedirs("src/single_window", {public = true})