Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-01-06 10:59:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source
This commit is contained in:
XMRig 2020-05-23 12:01:58 +07:00
commit 5c4cdfd80c
No known key found for this signature in database
GPG key ID: 446A53638BE94409
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/OpenSSL.cmake
View file

@ -5,7 +5,7 @@ if (WITH_TLS)
set(OPENSSL_USE_STATIC_LIBS TRUE) set(OPENSSL_USE_STATIC_LIBS TRUE)
set(OPENSSL_MSVC_STATIC_RT TRUE) set(OPENSSL_MSVC_STATIC_RT TRUE)
set(EXTRA_LIBS ${EXTRA_LIBS} Crypt32) set(EXTRA_LIBS ${EXTRA_LIBS} crypt32)
elseif (APPLE) elseif (APPLE)
set(OPENSSL_USE_STATIC_LIBS TRUE) set(OPENSSL_USE_STATIC_LIBS TRUE)
endif() endif()

2
src/backend/opencl/OclCache_win.cpp
View file

@ -24,7 +24,7 @@
#include <direct.h> #include <direct.h>
#include <Shlobj.h> #include <shlobj.h>
#include <windows.h> #include <windows.h>

2
src/crypto/rx/Rx_win.cpp
View file

@ -36,7 +36,7 @@
#include "crypto/rx/RxConfig.h" #include "crypto/rx/RxConfig.h"
#include <Windows.h> #include <windows.h>
#include <array> #include <array>
#include <string> #include <string>
#include <thread> #include <thread>

2
src/version.h
View file

@ -28,7 +28,7 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "XMRig miner" #define APP_DESC "XMRig miner"
#define APP_VERSION "5.11.2-dev" #define APP_VERSION "5.11.2"
#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-2020 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com"