diff --git a/cuda_renderer/.gitignore b/cuda_renderer/.gitignore index 0397738..731328f 100644 --- a/cuda_renderer/.gitignore +++ b/cuda_renderer/.gitignore @@ -1 +1 @@ -cuda_renderer \ No newline at end of file +cuda_renderer* diff --git a/cuda_renderer/Makefile.mak b/cuda_renderer/Makefile.mak new file mode 100644 index 0000000..1656854 --- /dev/null +++ b/cuda_renderer/Makefile.mak @@ -0,0 +1,7 @@ +cuda_renderer: main.cu mpi_cuda.cu + nvcc -ccbin cl -std=c++11 -m64 -I. \ + main.cu mpi_cuda.cu -o cuda_renderer + +clean: + del cuda_renderer.* + \ No newline at end of file diff --git a/cuda_renderer/main.cu b/cuda_renderer/main.cu index 9ef56bb..afabac6 100644 --- a/cuda_renderer/main.cu +++ b/cuda_renderer/main.cu @@ -56,7 +56,11 @@ void gpu2ffmpeg(const char* filename, uint8_t* d_out_arr_vid, cout << "ffmpeg, calling:" << endl; cout << sstm.str() << endl; // open a pipe to FFmpeg - if ( !(pPipe = popen(sstm.str().c_str(), "w")) ) { + #ifdef _WIN32 + if ( !(pPipe = _popen(sstm.str().c_str(), "w")) ) { + #else + if ( !(pPipe = popen(sstm.str().c_str(), "w")) ) { + #endif cout << "popen error" << endl; exit(1); }