izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(various): tedious updates (#3316)

Browse Source
This commit is contained in:
ReenigneArcher
2024-10-19 21:59:15 -04:00
committed by GitHub
parent a3ba700522
commit 60cf24225f
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitmodules vendored
View File

@@ -4,7 +4,7 @@
branch = master branch = master
[submodule "packaging/linux/flatpak/deps/shared-modules"] [submodule "packaging/linux/flatpak/deps/shared-modules"]
path = packaging/linux/flatpak/deps/shared-modules path = packaging/linux/flatpak/deps/shared-modules
url = https://github.com/flathub/shared-modules url = https://github.com/flathub/shared-modules.git
branch = master branch = master
[submodule "third-party/build-deps"] [submodule "third-party/build-deps"]
path = third-party/build-deps path = third-party/build-deps
@@ -16,8 +16,8 @@
branch = master branch = master
[submodule "third-party/googletest"] [submodule "third-party/googletest"]
path = third-party/googletest path = third-party/googletest
url = https://github.com/google/googletest/ url = https://github.com/google/googletest.git
branch = v1.14.x branch = main
[submodule "third-party/inputtino"] [submodule "third-party/inputtino"]
path = third-party/inputtino path = third-party/inputtino
url = https://github.com/games-on-whales/inputtino.git url = https://github.com/games-on-whales/inputtino.git
@@ -32,11 +32,11 @@
branch = master branch = master
[submodule "third-party/nv-codec-headers"] [submodule "third-party/nv-codec-headers"]
path = third-party/nv-codec-headers path = third-party/nv-codec-headers
url = https://github.com/FFmpeg/nv-codec-headers url = https://github.com/FFmpeg/nv-codec-headers.git
branch = sdk/12.0 branch = sdk/12.0
[submodule "third-party/nvapi-open-source-sdk"] [submodule "third-party/nvapi-open-source-sdk"]
path = third-party/nvapi-open-source-sdk path = third-party/nvapi-open-source-sdk
url = https://github.com/LizardByte/nvapi-open-source-sdk url = https://github.com/LizardByte/nvapi-open-source-sdk.git
branch = sdk branch = sdk
[submodule "third-party/Simple-Web-Server"] [submodule "third-party/Simple-Web-Server"]
path = third-party/Simple-Web-Server path = third-party/Simple-Web-Server
@@ -44,11 +44,11 @@
branch = master branch = master
[submodule "third-party/TPCircularBuffer"] [submodule "third-party/TPCircularBuffer"]
path = third-party/TPCircularBuffer path = third-party/TPCircularBuffer
url = https://github.com/michaeltyson/TPCircularBuffer url = https://github.com/michaeltyson/TPCircularBuffer.git
branch = master branch = master
[submodule "third-party/tray"] [submodule "third-party/tray"]
path = third-party/tray path = third-party/tray
url = https://github.com/LizardByte/tray url = https://github.com/LizardByte/tray.git
branch = master branch = master
[submodule "third-party/ViGEmClient"] [submodule "third-party/ViGEmClient"]
path = third-party/ViGEmClient path = third-party/ViGEmClient

5
cmake/compile_definitions/linux.cmake
View File

@@ -68,7 +68,10 @@ if(${SUNSHINE_ENABLE_CUDA})
# message(STATUS "CUDA NVCC Flags: ${CUDA_NVCC_FLAGS}") # message(STATUS "CUDA NVCC Flags: ${CUDA_NVCC_FLAGS}")
message(STATUS "CUDA Architectures: ${CMAKE_CUDA_ARCHITECTURES}") message(STATUS "CUDA Architectures: ${CMAKE_CUDA_ARCHITECTURES}")
elseif(${CUDA_FAIL_ON_MISSING}) elseif(${CUDA_FAIL_ON_MISSING})
message(FATAL_ERROR "CUDA not found") message(FATAL_ERROR
"CUDA not found.
If this is intentional, set '-DSUNSHINE_ENABLE_CUDA=OFF' or '-DCUDA_FAIL_ON_MISSING=OFF'"
)
endif() endif()
endif() endif()
if(CUDA_FOUND) if(CUDA_FOUND)

1
tests/CMakeLists.txt
View File

@@ -76,4 +76,3 @@ if (WIN32)
# this fixes libcurl linking errors when using non MSYS2 version of CMake # this fixes libcurl linking errors when using non MSYS2 version of CMake
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_SEARCH_START_STATIC 1) set_target_properties(${PROJECT_NAME} PROPERTIES LINK_SEARCH_START_STATIC 1)
endif () endif ()

2
third-party/googletest vendored

Submodule third-party/googletest updated: f8d7d77c06...b514bdc898