From a45cdd104d85043cef784ea2a294b334ef4610e7 Mon Sep 17 00:00:00 2001 From: liuxy <391861737@qq.com> Date: Wed, 6 May 2020 11:50:19 +0800 Subject: [PATCH 1/2] Add support for building on windows using cl use _popen if on windows --- cuda_renderer/.gitignore | 2 +- cuda_renderer/Makefile.mak | 7 +++++++ cuda_renderer/main.cu | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 cuda_renderer/Makefile.mak 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..37924f5 --- /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: + rm 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); } From c034635958b5fd0b3645cfadeaf03e533f14b609 Mon Sep 17 00:00:00 2001 From: liuxy <391861737@qq.com> Date: Wed, 6 May 2020 11:57:26 +0800 Subject: [PATCH 2/2] Use del instead of rm on windows --- cuda_renderer/Makefile.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cuda_renderer/Makefile.mak b/cuda_renderer/Makefile.mak index 37924f5..1656854 100644 --- a/cuda_renderer/Makefile.mak +++ b/cuda_renderer/Makefile.mak @@ -3,5 +3,5 @@ cuda_renderer: main.cu mpi_cuda.cu main.cu mpi_cuda.cu -o cuda_renderer clean: - rm cuda_renderer + del cuda_renderer.* \ No newline at end of file