From 76f34be395bd8a14e13e2e3eb97d6d972ef17512 Mon Sep 17 00:00:00 2001 From: loki Date: Fri, 11 Jun 2021 11:59:19 +0200 Subject: [PATCH] move third-party source files to folder third-party --- .gitmodules | 6 +-- CMakeLists.txt | 46 +++++++++---------- .../Simple-Web-Server | 0 ViGEmClient => third-party/ViGEmClient | 0 .../glad}/include/EGL/eglplatform.h | 0 .../glad}/include/KHR/khrplatform.h | 0 {glad => third-party/glad}/include/glad/egl.h | 0 {glad => third-party/glad}/include/glad/gl.h | 0 {glad => third-party/glad}/src/egl.c | 0 {glad => third-party/glad}/src/gl.c | 0 .../moonlight-common-c | 0 11 files changed, 26 insertions(+), 26 deletions(-) rename Simple-Web-Server => third-party/Simple-Web-Server (100%) rename ViGEmClient => third-party/ViGEmClient (100%) rename {glad => third-party/glad}/include/EGL/eglplatform.h (100%) rename {glad => third-party/glad}/include/KHR/khrplatform.h (100%) rename {glad => third-party/glad}/include/glad/egl.h (100%) rename {glad => third-party/glad}/include/glad/gl.h (100%) rename {glad => third-party/glad}/src/egl.c (100%) rename {glad => third-party/glad}/src/gl.c (100%) rename moonlight-common-c => third-party/moonlight-common-c (100%) diff --git a/.gitmodules b/.gitmodules index 93af2e68..497981c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "moonlight-common-c"] - path = moonlight-common-c + path = third-party/moonlight-common-c url = https://github.com/moonlight-stream/moonlight-common-c.git [submodule "Simple-Web-Server"] - path = Simple-Web-Server + path = third-party/Simple-Web-Server url = https://github.com/loki-47-6F-64/Simple-Web-Server.git [submodule "ViGEmClient"] - path = ViGEmClient + path = third-party/ViGEmClient url = https://github.com/ViGEm/ViGEmClient diff --git a/CMakeLists.txt b/CMakeLists.txt index c7edbf31..6442efc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(Sunshine) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) -add_subdirectory(Simple-Web-Server) +add_subdirectory(third-party/Simple-Web-Server) if(WIN32) # Ugly hack to compile with #include @@ -13,7 +13,7 @@ if(WIN32) PQOS_FLOWID=UINT32* QOS_NON_ADAPTIVE_FLOW=2) endif() -add_subdirectory(moonlight-common-c/enet) +add_subdirectory(third-party/moonlight-common-c/enet) find_package(Threads REQUIRED) find_package(OpenSSL REQUIRED) @@ -49,11 +49,11 @@ if(WIN32) sunshine/platform/windows/display_vram.cpp sunshine/platform/windows/display_ram.cpp sunshine/platform/windows/audio.cpp - ViGEmClient/src/ViGEmClient.cpp - ViGEmClient/include/ViGEm/Client.h - ViGEmClient/include/ViGEm/Common.h - ViGEmClient/include/ViGEm/Util.h - ViGEmClient/include/ViGEm/km/BusShared.h) + third-party/ViGEmClient/src/ViGEmClient.cpp + third-party/ViGEmClient/include/ViGEm/Client.h + third-party/ViGEmClient/include/ViGEm/Common.h + third-party/ViGEmClient/include/ViGEm/Util.h + third-party/ViGEmClient/include/ViGEm/km/BusShared.h) set(OPENSSL_LIBRARIES libssl.a @@ -103,12 +103,12 @@ else() sunshine/platform/linux/display.cpp sunshine/platform/linux/audio.cpp sunshine/platform/linux/input.cpp - glad/src/egl.c - glad/src/gl.c - glad/include/EGL/eglplatform.h - glad/include/KHR/khrplatform.h - glad/include/glad/gl.h - glad/include/glad/egl.h) + third-party/glad/src/egl.c + third-party/glad/src/gl.c + third-party/glad/include/EGL/eglplatform.h + third-party/glad/include/KHR/khrplatform.h + third-party/glad/include/glad/gl.h + third-party/glad/include/glad/egl.h) set(PLATFORM_LIBRARIES Xfixes @@ -127,7 +127,7 @@ else() set(PLATFORM_INCLUDE_DIRS ${X11_INCLUDE_DIR} /usr/include/libevdev-1.0 - glad/include) + third-party/glad/include) if(NOT DEFINED SUNSHINE_EXECUTABLE_PATH) set(SUNSHINE_EXECUTABLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/sunshine") @@ -140,12 +140,12 @@ set(Boost_USE_STATIC_LIBS ON) find_package(Boost COMPONENTS log filesystem REQUIRED) set(SUNSHINE_TARGET_FILES - moonlight-common-c/reedsolomon/rs.c - moonlight-common-c/reedsolomon/rs.h - moonlight-common-c/src/Input.h - moonlight-common-c/src/Rtsp.h - moonlight-common-c/src/RtspParser.c - moonlight-common-c/src/Video.h + third-party/moonlight-common-c/reedsolomon/rs.c + third-party/moonlight-common-c/reedsolomon/rs.h + third-party/moonlight-common-c/src/Input.h + third-party/moonlight-common-c/src/Rtsp.h + third-party/moonlight-common-c/src/RtspParser.c + third-party/moonlight-common-c/src/Video.h sunshine/utility.h sunshine/uuid.h sunshine/config.h @@ -185,9 +185,9 @@ set(SUNSHINE_TARGET_FILES include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/Simple-Web-Server - ${CMAKE_CURRENT_SOURCE_DIR}/moonlight-common-c/enet/include - ${CMAKE_CURRENT_SOURCE_DIR}/moonlight-common-c/reedsolomon + ${CMAKE_CURRENT_SOURCE_DIR}/third-party + ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/enet/include + ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/reedsolomon ${FFMPEG_INCLUDE_DIRS} ${PLATFORM_INCLUDE_DIRS} ) diff --git a/Simple-Web-Server b/third-party/Simple-Web-Server similarity index 100% rename from Simple-Web-Server rename to third-party/Simple-Web-Server diff --git a/ViGEmClient b/third-party/ViGEmClient similarity index 100% rename from ViGEmClient rename to third-party/ViGEmClient diff --git a/glad/include/EGL/eglplatform.h b/third-party/glad/include/EGL/eglplatform.h similarity index 100% rename from glad/include/EGL/eglplatform.h rename to third-party/glad/include/EGL/eglplatform.h diff --git a/glad/include/KHR/khrplatform.h b/third-party/glad/include/KHR/khrplatform.h similarity index 100% rename from glad/include/KHR/khrplatform.h rename to third-party/glad/include/KHR/khrplatform.h diff --git a/glad/include/glad/egl.h b/third-party/glad/include/glad/egl.h similarity index 100% rename from glad/include/glad/egl.h rename to third-party/glad/include/glad/egl.h diff --git a/glad/include/glad/gl.h b/third-party/glad/include/glad/gl.h similarity index 100% rename from glad/include/glad/gl.h rename to third-party/glad/include/glad/gl.h diff --git a/glad/src/egl.c b/third-party/glad/src/egl.c similarity index 100% rename from glad/src/egl.c rename to third-party/glad/src/egl.c diff --git a/glad/src/gl.c b/third-party/glad/src/gl.c similarity index 100% rename from glad/src/gl.c rename to third-party/glad/src/gl.c diff --git a/moonlight-common-c b/third-party/moonlight-common-c similarity index 100% rename from moonlight-common-c rename to third-party/moonlight-common-c