Skip to content
Snippets Groups Projects
Commit c56e6108 authored by fireice-uk's avatar fireice-uk Committed by GitHub
Browse files

Merge pull request #237 from psychocrypt/topic-mergeMasterBack

merge master back to dev
parents a16c06e7 5695fcbf
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ To configure the reports shown above you need to edit the httpd_port variable. T ...@@ -13,7 +13,7 @@ To configure the reports shown above you need to edit the httpd_port variable. T
1) Edit the config.txt file to enter your pool login and password. 1) Edit the config.txt file to enter your pool login and password.
2) Double click the exe file. 2) Double click the exe file.
XMR-Stak should compile on any C++11 compliant compiler. Windows compiler is assumed to be MSVC 2015 CE. MSVC build environment is not vendored. XMR-Stak should compile on any C++11 compliant compiler.
``` ```
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256 Hash: SHA256
...@@ -21,28 +21,27 @@ Hash: SHA256 ...@@ -21,28 +21,27 @@ Hash: SHA256
sha1sum sha1sum
d34a0ba0dd7b3b1f900a7e02772e197e974b4a73 libeay32.dll d34a0ba0dd7b3b1f900a7e02772e197e974b4a73 libeay32.dll
2ee9966a0fc163da58408d91be36b84fa287c10b ssleay32.dll 2ee9966a0fc163da58408d91be36b84fa287c10b ssleay32.dll
a03f81d7445005e0d51e3825e67cac8413df1068 xmr-stak-cpu.exe e4d8a974e58985214de163df0c1ed0f54250d7ee xmr-stak-cpu.exe
98bb62cd1f3c7a11a18d6c2b1f1bd6bf4b5b41a3 xmr-stak-cpu-notls.exe ae0153ff98df82022b2c392d6a17c5f3614f6a50 xmr-stak-cpu-notls.exe
sha3sum sha3sum
05003137a87313c81d6c348c9b96411c95d48dc22c35f36c39129747 libeay32.dll 05003137a87313c81d6c348c9b96411c95d48dc22c35f36c39129747 libeay32.dll
133c065d9ef2c93396382e2ba5d8c3ca8c6a57c6beb0159cb9a4b6c5 ssleay32.dll 133c065d9ef2c93396382e2ba5d8c3ca8c6a57c6beb0159cb9a4b6c5 ssleay32.dll
9666ae2cfa337599282615275ea05f4e6240fd571c86530583ac89aa xmr-stak-cpu.exe 7bfc30b06524dc9139a3157e2661d2a6f5720738dde8e490f05cc8e2 xmr-stak-cpu.exe
46f633b125907feed2f16fc97dcc8402a67218809fef226a77c0aa70 xmr-stak-cpu-notls.exe 005fb81fc3711a97b2ce65bad0ca97318d878dc793a8cba99c7d1f6f xmr-stak-cpu-notls.exe
date date
Sat 29 Apr 16:59:00 BST 2017 Wed 19 Jul 21:18:58 BST 2017
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v2 Version: GnuPG v2
iQEcBAEBCAAGBQJZBLhQAAoJEPsk95p+1Bw0bWYH/0jtGhKqahRGaxAnLLmA9rsK iQEcBAEBCAAGBQJZb77XAAoJEPsk95p+1Bw0GU4H/26sBwJzYSeWoLwo0LdmOPk3
HUsvIDkAFEshdcUK2yB32JXu4vltG2sbIb/AaY3qifFawhfMPQXGPhJ1YfWlJrI6 19n+svFYnz6NlxAjs+fvuTK992ilLMy2pa4PHKhot2oyZIgt2rRaFsvRADcHVraG
icqcPlvHRo88nSfpCfRA3EOjmrNSM4uXb4/FM9ongTgqBKPkSAoQjJfnhXQfOFKb nsIh4Oq31T9epZI0WxIH5FJlDx30fdGkpMTu9xt6ta2JXsmkDiCoZxmETuljB7Rw
ULyN0xRRMuqPxnAggzqn5mwcJ1qPFnuUDjcBssnHw21P/p72qrMK/pMp1LeGMpGZ xvnKeHiuTccp73C6Nd7dkuiemsOw0FZA7XXS/Kmwqm7n8BtCztY70R6SVN7QFbCz
+kzr7rS2wko7isJuMouddCK3rypxeIry2XfLehRqguhfXLw9Xi+HNmBCY+76bYWi C49s0A9cT4UbAUPuu8KvxFozmJHA/wDBYHgkq95Y6n/q116+Sc9BpdF8j+qK4YzZ
xXl2Nm/u3cPP/eQVrZz5H8eACwIv+LL1EV+9uLanWUa+IO5hHr3KElvKNKD6vN0= uM+B10XY0g7Qv376UoJRYKokpVaBxF08nD+JXLdL+zfQvnEfKgrhTnjaTkWFfEY=
=vGQV =jpgE
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----
``` ```
## Compile guides ## Compile guides
...@@ -104,7 +103,7 @@ If that happens, disable all auto-staring applications and run the miner after a ...@@ -104,7 +103,7 @@ If that happens, disable all auto-staring applications and run the miner after a
**msvcp140.dll and vcruntime140.dll not available errors** **msvcp140.dll and vcruntime140.dll not available errors**
Download and install this [runtime package](https://www.microsoft.com/en-us/download/details.aspx?id=48145) from Microsoft. *Warning: Do NOT use "missing dll" sites - dll's are exe files with another name, and it is a fairly safe bet that any dll on a shady site like that will be trojaned. Please download offical runtimes from Microsoft above.* Download and install this [runtime package](https://go.microsoft.com/fwlink/?LinkId=746572) from Microsoft. *Warning: Do NOT use "missing dll" sites - dll's are exe files with another name, and it is a fairly safe bet that any dll on a shady site like that will be trojaned. Please download offical runtimes from Microsoft above.*
**Error: MEMORY ALLOC FAILED: mmap failed** **Error: MEMORY ALLOC FAILED: mmap failed**
......
#pragma once #pragma once
#define XMR_STAK_NAME "xmr-stak-cpu" #define XMR_STAK_NAME "xmr-stak-cpu"
#define XMR_STAK_VERSION "1.4.1-dev" #define XMR_STAK_VERSION "1.3.0-1.5.0-dev"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment