Skip to content

GitLab

Commit 0fba96e7 authored by peastman's avatar peastman
Browse files

Merge pull request #982 from rmcgibbo/commit 

Compiling on Windows
parents 0b4a1077 dc8c70d2
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
cmake_modules/FindOpenCL.cmake
View file @ 0fba96e7
...@@ -79,6 +79,7 @@ find_library(OPENCL_LIBRARY ...@@ -79,6 +79,7 @@ find_library(OPENCL_LIBRARY
"/usr/local/cuda" "/usr/local/cuda"
"/usr/local/streamsdk" "/usr/local/streamsdk"
"/usr" "/usr"
"${CUDA_TOOLKIT_ROOT_DIR}"
PATH_SUFFIXES ${path_suffixes} "lib" PATH_SUFFIXES ${path_suffixes} "lib"
) )
......
libraries/pthreads/include/pthread.h
View file @ 0fba96e7
...@@ -54,9 +54,12 @@ ...@@ -54,9 +54,12 @@
#include <sys/timeb.h> #include <sys/timeb.h>
#include <process.h> #include <process.h>
#ifndef ETIMEDOUT
#define ETIMEDOUT 110 #define ETIMEDOUT 110
#endif
#ifndef ENOTSUP
#define ENOTSUP 134 #define ENOTSUP 134
#endif
#define PTHREAD_CANCEL_DISABLE 0 #define PTHREAD_CANCEL_DISABLE 0
#define PTHREAD_CANCEL_ENABLE 0x01 #define PTHREAD_CANCEL_ENABLE 0x01
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment