From de7455797ecd5d0c65b081b428a21df32151cb84 Mon Sep 17 00:00:00 2001 From: Lolcust Date: Mon, 26 Sep 2011 01:04:58 +0300 Subject: Tweaked to be slightly easier to use with Tenebrix, tested. --- AUTHORS | 4 ++++ README | 7 ++++++- cpu-miner.c | 22 ++++------------------ mknsis.sh | 3 +-- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/AUTHORS b/AUTHORS index 54da6f9..fad2de6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,5 @@ Jeff Garzik + +ArtForz + + Lolcust diff --git a/README b/README index 6145245..e7c6bb1 100644 --- a/README +++ b/README @@ -1,5 +1,8 @@ -This is a multi-threaded CPU miner for bitcoin. +This is a multi-threaded CPU miner for Tenebrix, fork of Jeff Garzik's refernce cpuminer. +New, GPU-hostile / CPU-friendly PoW is implemented. + + License: GPLv2. See COPYING for details. @@ -22,6 +25,8 @@ Basic WIN32 build instructions (on Fedora 13; requires mingw32): Usage instructions: Run "minerd --help" to see options. +REMEMBER - ONLY scrypt ALGORITHM WORKS FOR TENEBRIX ! + Also many issues and FAQs are covered in the forum thread dedicated to this program, http://www.bitcoin.org/smf/index.php?topic=1925.0;all diff --git a/cpu-miner.c b/cpu-miner.c index 7eb7af1..aa0db61 100644 --- a/cpu-miner.c +++ b/cpu-miner.c @@ -120,9 +120,9 @@ int opt_scantime = 5; static json_t *opt_config; static const bool opt_time = true; #ifdef WANT_X8664_SSE2 -static enum sha256_algos opt_algo = ALGO_SSE2_64; +static enum sha256_algos opt_algo = ALGO_SCRYPT; #else -static enum sha256_algos opt_algo = ALGO_C; +static enum sha256_algos opt_algo = ALGO_SCRYPT; #endif static int opt_n_threads; static int num_processors; @@ -150,22 +150,8 @@ static struct option_help options_help[] = { "See example-cfg.json for an example configuration." }, { "algo XXX", - "(-a XXX) Specify sha256 implementation:\n" - "\tc\t\tLinux kernel sha256, implemented in C (default)" -#ifdef WANT_SSE2_4WAY - "\n\t4way\t\ttcatm's 4-way SSE2 implementation" -#endif -#ifdef WANT_VIA_PADLOCK - "\n\tvia\t\tVIA padlock implementation" -#endif - "\n\tcryptopp\tCrypto++ C/C++ implementation" -#ifdef WANT_CRYPTOPP_ASM32 - "\n\tcryptopp_asm32\tCrypto++ 32-bit assembler implementation" -#endif -#ifdef WANT_X8664_SSE2 - "\n\tsse2_64\t\tSSE2 implementation for x86_64 machines" -#endif - }, + "(-a XXX) USE *ONLY* scrypt (e.g. --algo scrypt) WITH TENEBRIX\n" + "\tscrypt is the default now" }, { "quiet", "(-q) Disable per-thread hashmeter output (default: off)" }, diff --git a/mknsis.sh b/mknsis.sh index cc97dbe..3efd09b 100755 --- a/mknsis.sh +++ b/mknsis.sh @@ -30,5 +30,4 @@ echo -n "SHA1: " sha1sum "$OUT_BASE.zip" echo -n "MD5: " -md5sum "$OUT_BASE.zip" - +md5sum "$OUT_BASE.zip" \ No newline at end of file -- cgit v1.2.3-18-g5258