[Ecm-commits] r2640 - trunk

cvs commits ecm-commits at lists.gforge.inria.fr
Thu Feb 26 10:55:10 CET 2015


Author: bouvierc
Date: 2015-02-26 10:55:10 +0100 (Thu, 26 Feb 2015)
New Revision: 2640

Modified:
   trunk/Makefile.am
   trunk/cudawrapper.c
Log:
Small changes in compilation of gpu-ecm


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2015-02-26 07:33:13 UTC (rev 2639)
+++ trunk/Makefile.am	2015-02-26 09:55:10 UTC (rev 2640)
@@ -45,7 +45,7 @@
 libecm_la_LIBADD = $(MULREDCLIBRARY) $(GMPLIB)
 if WANT_CUDA 
   libecm_la_SOURCES += cudakernel.cu
-  libecm_la_LIBADD += $(CUDA_LIB_FLAGS)
+  libecm_la_LIBADD += $(CUDA_LIB_FLAGS) -lstdc++
   libecm_la_CFLAGS += $(CUDA_INC_FLAGS) $(CC_ADD_FLAGS_FOR_GPU)
 endif
 
@@ -116,7 +116,7 @@
 
 if WANT_CUDA 
 .cu.lo: cudakernel.h
-		$(LIBTOOL) --tag=CC --mode=compile $(NVCC) --compile $(CUDA_INC_FLAGS) $(NVCC_FLAGS) -o $@ $^ -static
+		$(LIBTOOL) --tag=CC --mode=compile $(NVCC) --compile $(CUDA_INC_FLAGS) $(NVCC_FLAGS) $(CPPFLAGS) -o $@ $^ -static
 endif
 
 ecm-params:	tune$(EXEEXT)

Modified: trunk/cudawrapper.c
===================================================================
--- trunk/cudawrapper.c	2015-02-26 07:33:13 UTC (rev 2639)
+++ trunk/cudawrapper.c	2015-02-26 09:55:10 UTC (rev 2640)
@@ -1,7 +1,6 @@
 #include "ecm-gpu.h"
 
 #ifdef WITH_GPU
-#include "cuda.h"
 
 #define TWO32 4294967296 /* 2^32 */ 
 



More information about the Ecm-commits mailing list