From c19ad3db01624b6e8bda1d902d5ec5be26143a78 Mon Sep 17 00:00:00 2001 From: Dave Lane <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 25 Jul 2026 10:01:04 -0400 Subject: [PATCH] chore: move nv-codec-headers to build-deps submodule (#5449) --- .gitmodules | 4 ---- cmake/compile_definitions/common.cmake | 5 ++++- third-party/nv-codec-headers | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 160000 third-party/nv-codec-headers diff --git a/.gitmodules b/.gitmodules index 308be2aa5..1355d7a85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,10 +29,6 @@ path = third-party/moonlight-common-c url = https://github.com/moonlight-stream/moonlight-common-c.git branch = master -[submodule "third-party/nv-codec-headers"] - path = third-party/nv-codec-headers - url = https://github.com/FFmpeg/nv-codec-headers.git - branch = master [submodule "third-party/nvapi"] path = third-party/nvapi url = https://github.com/NVIDIA/nvapi.git diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake index a95f9627b..d701023ef 100644 --- a/cmake/compile_definitions/common.cmake +++ b/cmake/compile_definitions/common.cmake @@ -59,7 +59,10 @@ elseif(UNIX) endif() endif() -include_directories(BEFORE SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nv-codec-headers/include") +include_directories( + BEFORE SYSTEM + "${CMAKE_SOURCE_DIR}/third-party/build-deps/third-party/FFmpeg/nv-codec-headers/include" +) file(GLOB NVENC_SOURCES CONFIGURE_DEPENDS "src/nvenc/*.cpp" "src/nvenc/*.h") list(APPEND PLATFORM_TARGET_FILES ${NVENC_SOURCES}) diff --git a/third-party/nv-codec-headers b/third-party/nv-codec-headers deleted file mode 160000 index 33a9ede8d..000000000 --- a/third-party/nv-codec-headers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 33a9ede8d9914299d9262539c576a15bd0a19621