From a8d40d15fd9c52fd69a330fb0a5b1b55eeb45102 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Wed, 12 Apr 2017 21:15:36 +0200 Subject: refactor CMake - allow compiling without microhttpd - allow compiling without OpenSSL - install `config.txt` with command `make install` --- cli-miner.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cli-miner.cpp') diff --git a/cli-miner.cpp b/cli-miner.cpp index 9eec369..8d5f83e 100644 --- a/cli-miner.cpp +++ b/cli-miner.cpp @@ -26,7 +26,10 @@ #include "jconf.h" #include "console.h" #include "donate-level.h" -#include "httpd.h" + +#ifndef CONF_NO_HTTPD +# include "httpd.h" +#endif #include #include @@ -109,6 +112,7 @@ int main(int argc, char *argv[]) return 0; } +#ifndef CONF_NO_HTTPD if(jconf::inst()->GetHttpdPort() != 0) { if (!httpd::inst()->start_daemon()) @@ -117,6 +121,7 @@ int main(int argc, char *argv[]) return 0; } } +#endif printer::inst()->print_str("-------------------------------------------------------------------\n"); printer::inst()->print_str("XMR-Stak-CPU mining software, CPU Version.\n"); -- cgit v1.1 From 7617fed8b1d3c420cce7a8ae0b482e84cd73d021 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Sat, 22 Apr 2017 22:47:45 +0200 Subject: add psychocrypt to cmd output --- cli-miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cli-miner.cpp') diff --git a/cli-miner.cpp b/cli-miner.cpp index 8d5f83e..deb462e 100644 --- a/cli-miner.cpp +++ b/cli-miner.cpp @@ -125,8 +125,8 @@ int main(int argc, char *argv[]) printer::inst()->print_str("-------------------------------------------------------------------\n"); printer::inst()->print_str("XMR-Stak-CPU mining software, CPU Version.\n"); - printer::inst()->print_str("Based on CPU mining code by wolf9466 (heavily optimized by myself).\n"); - printer::inst()->print_str("Brought to you by fireice_uk under GPLv3.\n\n"); + printer::inst()->print_str("Based on CPU mining code by wolf9466 (heavily optimized by fireice_uk).\n"); + printer::inst()->print_str("Brought to you by fireice_uk and psychocrypt under GPLv3.\n\n"); char buffer[64]; snprintf(buffer, sizeof(buffer), "Configurable dev donation level is set to %.1f %%\n\n", fDevDonationLevel * 100.0); printer::inst()->print_str(buffer); -- cgit v1.1 From d5b02fa0c351f5613358fdad3c4f7590860f937f Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Tue, 25 Apr 2017 19:50:10 +0100 Subject: CPU autoconfig --- cli-miner.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'cli-miner.cpp') diff --git a/cli-miner.cpp b/cli-miner.cpp index deb462e..38fb720 100644 --- a/cli-miner.cpp +++ b/cli-miner.cpp @@ -26,6 +26,7 @@ #include "jconf.h" #include "console.h" #include "donate-level.h" +#include "autoAdjust.hpp" #ifndef CONF_NO_HTTPD # include "httpd.h" @@ -99,6 +100,14 @@ int main(int argc, char *argv[]) return 0; } + if(jconf::inst()->NeedsAutoconf()) + { + autoAdjust adjust; + adjust.printConfig(); + win_exit(); + return 0; + } + if (!minethd::self_test()) { win_exit(); -- cgit v1.1