force merge

2021-04-24 23:46:04 +02:00
parent 0049b36471 66b4b70023
commit 488d8e5fc2
12 changed files with 331 additions and 15 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ if(WIN32)
 			${SUNSHINE_PREPARED_BINARIES}/lib/libswscale.a
 			${SUNSHINE_PREPARED_BINARIES}/lib/libx264.a
 			${SUNSHINE_PREPARED_BINARIES}/lib/libx265.a
+			${SUNSHINE_PREPARED_BINARIES}/lib/libhdr10plus.a
 			z lzma bcrypt C:/msys64/mingw64/lib/libiconv.a)
 	endif()
 else()
@@ -69,6 +70,7 @@ if(WIN32)
 		ViGEmClient/include/ViGEm/Util.h
 		ViGEmClient/include/ViGEm/km/BusShared.h)
 	list(PREPEND PLATFORM_LIBRARIES
+		ssp
 		winmm
 		ksuser
 		wsock32