From ea32195a8ac86341980375e95bda1a8148e7462d Mon Sep 17 00:00:00 2001 From: Christian Buchner Date: Tue, 6 May 2014 16:04:10 +0200 Subject: [PATCH] v0.9: adding missing VC++ project file and fixing Win compilation --- ccminer.vcxproj | 30 ++++++++++++++++++++++++++++++ ccminer.vcxproj.filters | 15 +++++++++++++++ quark/cuda_quark_compactionTest.cu | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ccminer.vcxproj b/ccminer.vcxproj index 5b3ad5c..0036b80 100644 --- a/ccminer.vcxproj +++ b/ccminer.vcxproj @@ -365,6 +365,18 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)" -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) + + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + + + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) @@ -383,18 +395,36 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)" -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) + + -Xptxas "-abi=yes -v" %(AdditionalOptions) + -Xptxas "-abi=yes -v" %(AdditionalOptions) + -Xptxas "-abi=yes -v" %(AdditionalOptions) + -Xptxas "-abi=yes -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) + + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) -Xptxas "-abi=no -v" %(AdditionalOptions) + + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + -Xptxas "-abi=no -v" %(AdditionalOptions) + diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters index c331f60..dba1622 100644 --- a/ccminer.vcxproj.filters +++ b/ccminer.vcxproj.filters @@ -295,5 +295,20 @@ Source Files\CUDA\heavy + + Source Files\CUDA\quark + + + Source Files\CUDA\quark + + + Source Files\CUDA\quark + + + Source Files\CUDA\quark + + + Source Files\CUDA\quark + \ No newline at end of file diff --git a/quark/cuda_quark_compactionTest.cu b/quark/cuda_quark_compactionTest.cu index c21169c..ed2e2c9 100644 --- a/quark/cuda_quark_compactionTest.cu +++ b/quark/cuda_quark_compactionTest.cu @@ -8,7 +8,7 @@ #include // aus cpu-miner.c -extern "C" int device_map[8]; +extern int device_map[8]; // diese Struktur wird in der Init Funktion angefordert static cudaDeviceProp props[8];