From 4c3964539f40ca5b039d285305692143f7dad8d7 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Thu, 6 Nov 2014 16:20:16 +0100 Subject: [PATCH] Fix vc debug builds, missing symbols --- blake32.cu | 1 - ccminer.vcxproj | 24 ++++++++++++++++++------ cpu-miner.c | 1 - miner.h | 1 + util.c | 8 ++++---- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/blake32.cu b/blake32.cu index dd3747e..1fb763a 100644 --- a/blake32.cu +++ b/blake32.cu @@ -42,7 +42,6 @@ extern "C" void blake256hash(void *output, const void *input, int8_t rounds = 14 // in cpu-miner.c extern bool opt_n_threads; -extern bool opt_tracegpu; extern int device_map[8]; #if PRECALC64 diff --git a/ccminer.vcxproj b/ccminer.vcxproj index 623fab2..8eb0499 100644 --- a/ccminer.vcxproj +++ b/ccminer.vcxproj @@ -73,7 +73,7 @@ true - true + false false @@ -85,13 +85,17 @@ Level3 Disabled + MultiThreadedDebugDLL + true WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions) .;compat;compat\curl-for-windows\curl\include;compat\jansson;compat\getopt;compat\pthreads;compat\curl-for-windows\openssl\openssl\include;compat\curl-for-windows\zlib;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir) + true true Console - cudart_static.lib;cuda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;pthreadVC2.lib;libcurl.x86.lib;openssl.x86.lib;zlib.x86.lib;ws2_32.lib;Wldap32.lib;%(AdditionalDependencies) + cudart_static.lib;cuda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;pthreadVC2.lib;libcurl.x86.lib;openssl.x86.lib;zlib.x86.lib;ws2_32.lib;Wldap32.lib;%(AdditionalDependencies) + libcmt.lib;msvcrt.lib compat\pthreads\x86;compat\curl-for-windows\out\x86\Release\lib;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) /NODEFAULTLIB:LIBCMT %(AdditionalOptions) true @@ -108,15 +112,20 @@ Level3 Disabled + MultiThreadedDebugDLL + true WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions) .;compat;compat\curl-for-windows\curl\include;compat\jansson;compat\getopt;compat\pthreads;compat\curl-for-windows\openssl\openssl\include;compat\curl-for-windows\zlib;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir) + 8Bytes + true true Console - cudart_static.lib;cuda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;pthreadVC2.lib;libcurl.x64.lib;openssl.x64.lib;zlib.x64.lib;ws2_32.lib;Wldap32.lib;%(AdditionalDependencies) + cudart_static.lib;cuda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;pthreadVC2.lib;libcurl.x64.lib;openssl.x64.lib;zlib.x64.lib;ws2_32.lib;Wldap32.lib;%(AdditionalDependencies) + libcmt.lib compat\pthreads\x64;compat\curl-for-windows\out\x64\Release\lib;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - /NODEFAULTLIB:LIBCMT %(AdditionalOptions) + /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) true @@ -141,8 +150,9 @@ false true true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;MAXWELL_OR_FERMI=1;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions) .;compat;compat\curl-for-windows\curl\include;compat\jansson;compat\getopt;compat\pthreads;compat\curl-for-windows\openssl\openssl\include;compat\curl-for-windows\zlib;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir) + true SyncCThrow @@ -151,6 +161,7 @@ true Console cudart_static.lib;cuda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;pthreadVC2.lib;libcurl.x86.lib;openssl.x86.lib;zlib.x86.lib;ws2_32.lib;Wldap32.lib;%(AdditionalDependencies) + libcmt.lib compat\pthreads\x86;compat\curl-for-windows\out\x86\Release\lib;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) /NODEFAULTLIB:LIBCMT %(AdditionalOptions) false @@ -182,7 +193,7 @@ false true true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;MAXWELL_OR_FERMI=1;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions) .;compat;compat\curl-for-windows\curl\include;compat\jansson;compat\getopt;compat\pthreads;compat\curl-for-windows\openssl\openssl\include;compat\curl-for-windows\zlib;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir) @@ -191,6 +202,7 @@ true Console cudart_static.lib;cuda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;pthreadVC2.lib;libcurl.x64.lib;openssl.x64.lib;zlib.x64.lib;ws2_32.lib;Wldap32.lib;%(AdditionalDependencies) + libcmt.lib compat\pthreads\x64;compat\curl-for-windows\out\x64\Release\lib;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) /NODEFAULTLIB:LIBCMT %(AdditionalOptions) false diff --git a/cpu-miner.c b/cpu-miner.c index b2691f5..c1401cb 100644 --- a/cpu-miner.c +++ b/cpu-miner.c @@ -188,7 +188,6 @@ static const char *algo_names[] = { }; bool opt_debug = false; -bool opt_tracegpu = false; bool opt_protocol = false; bool opt_benchmark = false; bool want_longpoll = true; diff --git a/miner.h b/miner.h index fa9307d..8b59612 100644 --- a/miner.h +++ b/miner.h @@ -352,6 +352,7 @@ extern bool opt_benchmark; extern bool opt_debug; extern bool opt_quiet; extern bool opt_protocol; +extern bool opt_tracegpu; extern int opt_timeout; extern bool want_longpoll; extern bool have_longpoll; diff --git a/util.c b/util.c index aef2ecf..f1dd63c 100644 --- a/util.c +++ b/util.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -36,6 +35,8 @@ #include "miner.h" #include "elist.h" +bool opt_tracegpu = false; + struct data_buffer { void *buf; size_t len; @@ -502,7 +503,7 @@ void *aligned_calloc(int size) void aligned_free(void *ptr) { #ifdef _MSC_VER - return _aligned_free(ptr); + _aligned_free(ptr); #else free(((void**)ptr)[-1]); #endif @@ -1489,13 +1490,12 @@ extern void applog_hash(uchar *hash) #define printpfx(n,h) \ printf("%s%12s%s: %s\n", CL_BLU, n, CL_N, format_hash(s, h)) -extern bool opt_tracegpu; void do_gpu_tests(void) { #ifdef _DEBUG unsigned long done; char s[128] = { '\0' }; - uchar buf[128], hash[128]; + uchar buf[128]; uint32_t tgt[8] = { 0 }; memset(buf, 0, sizeof buf);