diff --git a/.gitmodules b/.gitmodules index e1b90b92..308be2aa 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/nanors"] - path = third-party/nanors - url = https://github.com/sleepybishop/nanors.git - branch = master [submodule "third-party/nv-codec-headers"] path = third-party/nv-codec-headers url = https://github.com/FFmpeg/nv-codec-headers.git diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake index e3d521fc..924f2f5f 100644 --- a/cmake/compile_definitions/common.cmake +++ b/cmake/compile_definitions/common.cmake @@ -62,9 +62,9 @@ set(SUNSHINE_TARGET_FILES "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Rtsp.h" "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/RtspParser.c" "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Video.h" - "${CMAKE_SOURCE_DIR}/third-party/nanors/deps/obl/oblas_common.c" - "${CMAKE_SOURCE_DIR}/third-party/nanors/deps/obl/oblas_lite.c" - "${CMAKE_SOURCE_DIR}/third-party/nanors/rs.c" + "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/deps/obl/oblas_common.c" + "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/deps/obl/oblas_lite.c" + "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/rs.c" "${CMAKE_SOURCE_DIR}/src/upnp.cpp" "${CMAKE_SOURCE_DIR}/src/upnp.h" "${CMAKE_SOURCE_DIR}/src/cbs.cpp" @@ -138,8 +138,8 @@ include_directories( SYSTEM "${CMAKE_SOURCE_DIR}/third-party" "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/enet/include" - "${CMAKE_SOURCE_DIR}/third-party/nanors" - "${CMAKE_SOURCE_DIR}/third-party/nanors/deps/obl" + "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors" + "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/nanors/deps/obl" ${OPENSSL_INCLUDE_DIR} ${Opus_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS} diff --git a/third-party/nanors b/third-party/nanors deleted file mode 160000 index c3529fda..00000000 --- a/third-party/nanors +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3529fda520f53cd007328ba30b6ad3f89947722