Commit graph

112 commits

Author SHA1 Message Date
BenDroid
e9edd366fe Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
	src/App.cpp
	src/App.h
	src/Cpu.cpp
	src/Options.cpp
	src/Options.h
	src/crypto/CryptoNight_arm.h
	src/crypto/CryptoNight_x86.h
	src/version.h
2018-03-02 21:29:33 +01:00
BenDroid
9e37fa98fd Manual merged #43 Mac OS Compilation fixes 2018-02-21 23:17:11 +01:00
BenDroid
a16b608643 Added workaround for xmrigCCServer build issues 2018-01-20 14:16:05 +01:00
sebastianstolzenberg
12d2663b5a Fixes stub build break and maybe also arm (#31) 2018-01-20 13:34:56 +01:00
Ben Gräf
cf868666d4
Preparation for #1.4.0 (#30)
- Fixed CPU affinity on Windows for NUMA and CPUs with lot of cores
- Implemented per thread configurable Multihash mode (double, triple, quadruple, quintuple)
- Rebased from XMRig 2.4.4
2018-01-19 19:42:06 +01:00
stanz2g
f93187b024
can build without microhttpd when WITH_HTTPD=OFF 2018-01-06 17:07:07 +08:00
BenDroid
1573f50a4b Fixed MSC_VER for latest Visual Studio builds
Added build type to summary to detect if debug or release build
2017-12-24 21:16:28 +01:00
BenDroid
7368eb0bca Merged latest xmrig master into master 2017-12-16 22:44:01 +01:00
XMRig
fbd100ef10 #262 Reduce cmake version requirement to 2.8. 2017-12-16 19:27:11 +07:00
BenDroid
9e9f708fd8 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	src/Options.h
	src/Platform_unix.cpp
	src/log/ConsoleLog.cpp
	src/version.h
2017-12-03 21:17:56 +01:00
XMRig
aa4f8b6fa7 #216 Added ARMv7 support. 2017-11-26 22:23:23 +03:00
XMRig
47527d48ee Fixed build in termux environment, thanks Imran Yusuff. 2017-11-24 00:23:04 +03:00
Ben Gräf
225451bb51
Fixed compile issue for xmrigCCServer 2017-11-21 07:53:44 +01:00
BenDroid
3e4cd61594 Refactored CMake file to support static build of miner and daemon 2017-11-18 21:12:14 +01:00
BenDroid
f914e6d46c Removed libcurl dependency and fixed avgTime round in dashboard 2017-11-07 18:51:55 +01:00
XMRig
6cc152e26f Added ARMv8 (aarch64) support. 2017-11-06 03:11:35 +03:00
BenDroid
83f1a8f671 Removed CC files to use xmrigCC-common sub repo 2017-11-04 19:45:51 +01:00
BenDroid
8daac3d022 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	README.md
2017-11-03 20:22:37 +01:00
XMRig
d403dcf95c Optimized software aes. 2017-11-03 05:35:29 +03:00
BenDroid
5c2473b122 Merged branch master into master 2017-10-31 15:49:01 +01:00
XMRig
6479d6bb6f #157 Explicitly add linking with librt, probably fix build issue with some old Linux. 2017-10-30 00:48:49 +03:00
Ben Gräf
627321b6cc Fixed windows build 2017-10-24 14:24:29 -07:00
Ben Gräf
0dc02587c1 Enabled CC again 2017-10-24 09:13:04 +02:00
Ben Gräf
b27aa6692c temp disabled CC 2017-10-24 09:11:26 +02:00
BenDroid
77cadea8d6 Disabled BUILD_TYPE debug to improve performance 2017-10-22 10:58:18 +02:00
Ben Gräf
bb09944cb8 Merge remote-tracking branch 'xmrig/master' into feature_cc 2017-10-21 22:13:24 +02:00
XMRig
10df3ec227 Code style fixes for FreeBSD support pull request. 2017-10-20 19:54:18 +03:00
vcambur
9c0fe73102 Some FreeBSD fixes 2017-10-20 08:41:08 +00:00
Ben Gräf
3f39ca31fd Added xmrigDaemon to control xmrigMiner
Fixed some issues in CCClient and CCServer
2017-10-19 22:12:20 +02:00
Ben Gräf
215efcabb8 Implemented CCClient and extended CCServer service 2017-10-16 21:38:00 +02:00
Ben Gräf
003e17d18f Cleanup CMakeLists, Added ControlCommand 2017-10-08 20:46:48 +02:00
Ben Gräf
4f606644fe Fixed compile issues 2017-10-07 22:54:49 +02:00
Ben Gräf
b6fc43b8a4 Merge remote-tracking branch 'xmrig/master' into feature_cc 2017-10-07 20:05:56 +02:00
XMRig
b46f376f32 Remove unused variables . 2017-10-07 19:23:46 +03:00
XMRig
f02b98efe7 Fix clang warnings and job comparison bug. 2017-10-07 18:58:04 +03:00
XMRig
fc810dc87b Fix for msvc 2017-10-07 00:06:58 +03:00
Ben Gräf
eed483581a Added initial CC Server / Webservice 2017-10-06 22:01:17 +02:00
XMRig
04d3dd6df1 #130 Fixed compatibility with CMake older than 3.1.0. 2017-10-06 19:34:06 +03:00
XMRig
af51513614 libjansson replaced to rapidjson.
Sync changes with proxy.
2017-10-04 23:33:30 +03:00
XMRig
80b0ac2492 #87 Use CMAKE_CXX_STANDARD. 2017-09-04 06:12:45 +03:00
XMRig
4928b6d3e3 Sync changes with xmrig-nvidia 2017-09-02 19:04:40 +03:00
XMRig
d0db4770ed Added API port to summary. 2017-09-02 15:50:27 +03:00
XMRig
8e08df2fd2 Rename Results => NetworkState. 2017-09-01 15:35:00 +03:00
XMRig
9e9cddedc5 Added results statistics to API. 2017-09-01 08:02:56 +03:00
XMRig
71f06530df Added classes Api and ApiState. 2017-08-31 04:30:59 +03:00
XMRig
5601c7a672 Added Httpd class and API config options. 2017-08-31 02:28:33 +03:00
XMRig
850e355049 Force define __STDC_FORMAT_MACROS on all platforms. 2017-08-29 23:41:57 +03:00
XMRig
61859dfe14 Add class Platform. 2017-08-15 03:04:46 +03:00
XMRig
a07b0e5953 Fix Visual Studio warnings. 2017-08-14 09:30:41 +03:00
XMRig
776f77a8d4 Added IConsoleListener 2017-07-23 09:36:30 +03:00