Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

2021-09-18 15:25:37 +02:00
parent 73404e1b92 1baab36dc6
commit e42fdbfcdd
8 changed files with 150 additions and 70 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,7 +48,11 @@ if(NOT WIN32 OR PTHREAD)
 	target_sources(86Box PRIVATE thread.c)
 	if(WIN32 AND VCPKG_TOOLCHAIN)
 		find_package(pthreads REQUIRED)
-		target_link_libraries(86Box pthreads)
+		if (PThreads4W_FOUND)
+			target_link_libraries(86Box PThreads4W::PThreads4W)
+		else()
+			target_link_libraries(86Box pthreads)
+		endif()
 	else()
 		set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 		find_package(Threads REQUIRED)