fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source
This commit is contained in:
XMRig 2017-08-30 22:11:00 +03:00
commit 35c2a729ec
5 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,3 +1,6 @@
# v2.3.1
- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console.
# v2.3.0 # v2.3.0
- Added `--cpu-priority` option (0 idle, 2 normal to 5 highest). - Added `--cpu-priority` option (0 idle, 2 normal to 5 highest).
- Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`. - Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`.

2
CMakeLists.txt
View file

@ -125,6 +125,7 @@ else()
set(EXTRA_LIBS pthread) set(EXTRA_LIBS pthread)
endif() endif()
add_definitions(/D__STDC_FORMAT_MACROS)
add_definitions(/DUNICODE) add_definitions(/DUNICODE)
#add_definitions(/DAPP_DEBUG) #add_definitions(/DAPP_DEBUG)
@ -148,7 +149,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
if (WIN32) if (WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
add_definitions(/D__STDC_FORMAT_MACROS)
else() else()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
endif() endif()

5
README.md
View file

@ -18,9 +18,10 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
* [Contacts](#contacts) * [Contacts](#contacts)
## Features ## Features
* High performance (290+ H/s on i7 6700). * High performance.
* Official Windows support. * Official Windows support.
* Small Windows executable, only 535 KB without dependencies. * Small Windows executable, without dependencies.
* x86/x64 support.
* Support for backup (failover) mining server. * Support for backup (failover) mining server.
* keepalived support. * keepalived support.
* Command line options compatible with cpuminer. * Command line options compatible with cpuminer.

7
src/log/ConsoleLog.cpp
View file

@ -133,7 +133,12 @@ void ConsoleLog::text(const char* fmt, va_list args)
bool ConsoleLog::isWritable() const bool ConsoleLog::isWritable() const
{ {
return uv_is_writable(reinterpret_cast<const uv_stream_t*>(&m_tty)) == 1 && uv_guess_handle(1) == UV_TTY; if (uv_is_writable(reinterpret_cast<const uv_stream_t*>(&m_tty)) != 1) {
return false;
}
const uv_handle_type type = uv_guess_handle(1);
return type == UV_TTY || type == UV_NAMED_PIPE;
} }

6
src/version.h
View file

@ -26,15 +26,15 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "Monero (XMR) CPU miner" #define APP_DESC "XMRig CPU miner"
#define APP_VERSION "2.3.0-dev" #define APP_VERSION "2.3.1"
#define APP_DOMAIN "xmrig.com" #define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com" #define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com"
#define APP_VER_MAJOR 2 #define APP_VER_MAJOR 2
#define APP_VER_MINOR 3 #define APP_VER_MINOR 3
#define APP_VER_BUILD 0 #define APP_VER_BUILD 1
#define APP_VER_REV 0 #define APP_VER_REV 0
#ifdef _MSC_VER #ifdef _MSC_VER