From e4e952b0dd29c77f8df0571e1bae2c7cef316253 Mon Sep 17 00:00:00 2001 From: orignal Date: Tue, 24 Oct 2017 10:59:49 -0400 Subject: [PATCH] fixed build error --- Makefile.am | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index c6dcccd..5228789 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,25 +7,28 @@ else JANSSON_INCLUDES= endif -EXTRA_DIST = - autogen.sh README.md README.txt LICENSE.txt \ - ccminer.sln ccminer.vcxproj ccminer.vcxproj.filters \ - compat/gettimeofday.c compat/getopt/getopt_long.c +EXTRA_DIST = autogen.sh README.md README.txt LICENSE.txt \ + ccminer.sln ccminer.vcxproj ccminer.vcxproj.filters \ + compat/gettimeofday.c compat/getopt/getopt_long.c SUBDIRS = compat bin_PROGRAMS = ccminer -ccminer_SOURCES = - api.cpp bench.cpp bignum.cpp ccminer.cpp compat.h crc32.c cuda.cpp hashlog.cpp nvml.cpp nvsettings.cpp \ - pools.cpp stats.cpp sysinfos.cpp util.cpp \ - compat/getopt/getopt.h compat/inttypes.h compat/stdbool.h compat/sys/time.h compat/unistd.h \ - elist.h miner.h uint256.h cuda_checkhash.cu sph/streebog.c gost/cuda_gosthash.cu gost/gost.cu \ +ccminer_SOURCES = elist.h miner.h compat.h \ + compat/inttypes.h compat/stdbool.h compat/unistd.h \ + compat/sys/time.h compat/getopt/getopt.h \ + crc32.c cuda_checkhash.cu \ + ccminer.cpp pools.cpp util.cpp bench.cpp bignum.cpp \ + api.cpp hashlog.cpp nvml.cpp stats.cpp sysinfos.cpp cuda.cpp \ + nvsettings.cpp \ + sph/streebog.c gost/gost.cu gost/cuda_gosthash.cu -if HAVE_NVML + +#if HAVE_NVML nvml_defs = -DUSE_WRAPNVML nvml_libs = -ldl -endif +#endif if HAVE_WINDOWS ccminer_SOURCES += compat/winansi.c @@ -35,17 +38,6 @@ ccminer_LDFLAGS = $(PTHREAD_FLAGS) @CUDA_LDFLAGS@ ccminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @CUDA_LIBS@ @OPENMP_CFLAGS@ @LIBS@ $(nvml_libs) ccminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(CPPFLAGS) $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(DEF_INCLUDES) $(nvml_defs) -if HAVE_OSX -ccminer_CPPFLAGS += -I/usr/local/llvm/lib/clang/4.0.0/include -ccminer_LDFLAGS += -L/usr/local/llvm/lib -ccminer_LDADD += -lomp -endif - -#ccminer_CPPFLAGS += -DUSE_LIBSODIUM -#ccminer_LDFLAGS += -Lequi/lib -#ccminer_LDADD += -lsodium -ccminer_LDADD += -lcuda - nvcc_ARCH = -gencode=arch=compute_50,code=\"sm_50,compute_50\" #nvcc_ARCH += -gencode=arch=compute_52,code=\"sm_52,compute_52\" @@ -59,3 +51,4 @@ nvcc_FLAGS += $(JANSSON_INCLUDES) --ptxas-options="-v" # we're now targeting all major compute architectures within one binary. .cu.o: $(NVCC) $(nvcc_FLAGS) --maxrregcount=128 -o $@ -c $< +