Merge branch 'master' into multi-monitor

ago%!(EXTRA string=13 years) · d3a2d268f6
parent 1071966d55 d5e4204ed1
commit d3a2d268f6
1 changed files with 4 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -17,7 +17,10 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 find_package(OpenGL REQUIRED)
-set(CMAKE_THREAD_PREFER_PTHREADS YES)
+if (NOT WIN32)
    set(CMAKE_THREAD_PREFER_PTHREADS YES)
 endif()
 find_package(Threads)
 if (CMAKE_THREAD_LIBS_INIT)
    list(APPEND glfw_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})