From c487383cf4bdb10edbc36904504719a131072568 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Fri, 20 Jan 2012 09:12:49 +1100 Subject: [PATCH] Allow CPU mining explicitly enable only if other mining support is built in. --- README | 2 +- main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 702cc754..12386bb3 100644 --- a/README +++ b/README @@ -203,7 +203,7 @@ CPU only options: sse2_64 SSE2 64 bit implementation for x86_64 machines sse4_64 SSE4.1 64 bit implementation for x86_64 machines (default: sse2_64) --cpu-threads|-t Number of miner CPU threads (default: 4) ---enable-cpu|-C Enable CPU mining with other mining (default: no CPU mining if suitable devices exist) +--enable-cpu|-C Enable CPU mining with other mining (default: no CPU mining if other devices exist) diff --git a/main.c b/main.c index 2627befb..97704c4b 100644 --- a/main.c +++ b/main.c @@ -1574,10 +1574,10 @@ static struct opt_table opt_config_table[] = { set_float_0_to_99, &opt_show_floatval, &opt_donation, "Set donation percentage to cgminer author (0.0 - 99.9)"), #ifdef HAVE_OPENCL -#ifdef WANT_CPUMINE +#if defined(WANT_CPUMINE) && (defined(HAVE_OPENCL) || defined(USE_BITFORCE)) OPT_WITHOUT_ARG("--enable-cpu|-C", opt_set_bool, &opt_usecpu, - "Enable CPU mining with GPU mining (default: no CPU mining if suitable GPUs exist)"), + "Enable CPU mining with other mining (default: no CPU mining if other devices exist)"), #endif #endif OPT_WITH_ARG("--expiry|-E",