diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-12-12 01:14:00 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-12-12 01:14:00 +0300 |
| commit | d1237d24ca8e98536c2a2a05c0143b5fe61e8144 (patch) | |
| tree | 278440c832180ea9f682dd72e9dfb1d559213d87 /build_files/cmake | |
| parent | 5049322e6252617ab9477338bf2f5d3e4d7845d6 (diff) | |
| parent | ba8d6ca3dd92eed5d679caa28f5446cd07b8a112 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 5eeda2d1926..04ab2aeb93a 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -225,7 +225,7 @@ if(NOT JPEG_FOUND) endif() set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include) -set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib) +set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib) set(FREETYPE ${LIBDIR}/freetype) set(FREETYPE_INCLUDE_DIRS |