mirror of
https://github.com/xmrig/xmrig.git
synced 2024-12-31 16:09:46 +00:00
Merge branch 'master' into dev
This commit is contained in:
commit
5c4cdfd80c
4 changed files with 4 additions and 4 deletions
|
@ -5,7 +5,7 @@ if (WITH_TLS)
|
|||
set(OPENSSL_USE_STATIC_LIBS TRUE)
|
||||
set(OPENSSL_MSVC_STATIC_RT TRUE)
|
||||
|
||||
set(EXTRA_LIBS ${EXTRA_LIBS} Crypt32)
|
||||
set(EXTRA_LIBS ${EXTRA_LIBS} crypt32)
|
||||
elseif (APPLE)
|
||||
set(OPENSSL_USE_STATIC_LIBS TRUE)
|
||||
endif()
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
|
||||
#include <direct.h>
|
||||
#include <Shlobj.h>
|
||||
#include <shlobj.h>
|
||||
#include <windows.h>
|
||||
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "crypto/rx/RxConfig.h"
|
||||
|
||||
|
||||
#include <Windows.h>
|
||||
#include <windows.h>
|
||||
#include <array>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#define APP_ID "xmrig"
|
||||
#define APP_NAME "XMRig"
|
||||
#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_SITE "www.xmrig.com"
|
||||
#define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com"
|
||||
|
|
Loading…
Reference in a new issue