jakoddannudau/rig
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync changes with xmrig-nvidia

Browse Source
This commit is contained in:
XMRig 2017-09-02 19:04:40 +03:00
parent d0db4770ed
commit 4928b6d3e3
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -198,7 +198,11 @@ if (HAVE_SYSLOG_H)
set(SOURCES_SYSLOG src/log/SysLog.h src/log/SysLog.cpp)
endif()
find_package(MHD REQUIRED)
if (NOT WITH_AEON)
add_definitions(/DXMRIG_NO_AEON)
endif()
find_package(MHD)
if (WITH_HTTPD AND MHD_FOUND)
include_directories(${MHD_INCLUDE_DIRS})

2
cmake/FindMHD.cmake
View File

@ -24,7 +24,7 @@ set(MHD_LIBRARIES ${MHD_LIBRARY})
# same naming convention as in qt (appending debug library with d)
# boost is using the same "hack" as us with "optimized" and "debug"
# official MHD project actually uses _d suffix
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL MSVC)
if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
find_library(
MHD_LIBRARY_DEBUG
NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d

20
src/Options.cpp
View File

@ -116,9 +116,9 @@ static struct option const options[] = {
{ "user-agent", 1, nullptr, 1008 },
{ "userpass", 1, nullptr, 'O' },
{ "version", 0, nullptr, 'V' },
{ "api-port", 1, nullptr, 3000 },
{ "api-access-token", 1, nullptr, 3001 },
{ "api-worker-id", 1, nullptr, 3002 },
{ "api-port", 1, nullptr, 4000 },
{ "api-access-token", 1, nullptr, 4001 },
{ "api-worker-id", 1, nullptr, 4002 },
{ 0, 0, 0, 0 }
};
@ -157,9 +157,9 @@ static struct option const pool_options[] = {
static struct option const api_options[] = {
{ "port", 1, nullptr, 3000 },
{ "access-token", 1, nullptr, 3001 },
{ "worker-id", 1, nullptr, 3002 },
{ "port", 1, nullptr, 4000 },
{ "access-token", 1, nullptr, 4001 },
{ "worker-id", 1, nullptr, 4002 },
{ 0, 0, 0, 0 }
};
@ -316,12 +316,12 @@ bool Options::parseArg(int key, const char *arg)
m_colors = false;
break;
case 3001: /* --access-token */
case 4001: /* --access-token */
free(m_apiToken);
m_apiToken = strdup(arg);
break;
case 3002: /* --worker-id */
case 4002: /* --worker-id */
free(m_apiWorkerId);
m_apiWorkerId = strdup(arg);
break;
@ -334,7 +334,7 @@ bool Options::parseArg(int key, const char *arg)
case 1004: /* --max-cpu-usage */
case 1007: /* --print-time */
case 1021: /* --cpu-priority */
case 3000: /* --api-port */
case 4000: /* --api-port */
return parseArg(key, strtol(arg, nullptr, 10));
case 'B': /* --background */
@ -457,7 +457,7 @@ bool Options::parseArg(int key, uint64_t arg)
}
break;
case 3000: /* --api-port */
case 4000: /* --api-port */
if (arg <= 65536) {
m_apiPort = (int) arg;
}