Fixed MSC_VER for latest Visual Studio builds

Added build type to summary to detect if debug or release build
This commit is contained in:
BenDroid 2017-12-24 21:16:28 +01:00
parent c894c1e88c
commit 1573f50a4b
3 changed files with 10 additions and 4 deletions

View file

@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project(xmrig) project(xmrig)
#set(CMAKE_BUILD_TYPE Debug) #set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_BUILD_TYPE Release)
option(WITH_LIBCPUID "Use Libcpuid" ON) option(WITH_LIBCPUID "Use Libcpuid" ON)
option(WITH_AEON "CryptoNight-Lite support" ON) option(WITH_AEON "CryptoNight-Lite support" ON)

View file

@ -51,9 +51,8 @@ static void print_versions()
buf[0] = '\0'; buf[0] = '\0';
# endif # endif
Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mVERSIONS: \x1B[01;36m%s/%s\x1B[01;37m libuv/%s%s \x1B[01;36m(%s)" : " * VERSIONS: %s/%s libuv/%s%s (%s)",
Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mVERSIONS: \x1B[01;36m%s/%s\x1B[01;37m libuv/%s%s" : " * VERSIONS: %s/%s libuv/%s%s", APP_NAME, APP_VERSION, uv_version_string(), buf, BUILD_TYPE);
APP_NAME, APP_VERSION, uv_version_string(), buf);
} }

View file

@ -46,8 +46,14 @@
#define APP_VER_BUILD 2 #define APP_VER_BUILD 2
#define APP_VER_REV 0 #define APP_VER_REV 0
#ifndef NDEBUG
#define BUILD_TYPE "DEBUG"
#else
#define BUILD_TYPE "RELEASE"
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
# if (_MSC_VER == 1910 || _MSC_VER == 1911) # if (_MSC_VER >= 1910)
# define MSVC_VERSION 2017 # define MSVC_VERSION 2017
# elif _MSC_VER == 1900 # elif _MSC_VER == 1900
# define MSVC_VERSION 2015 # define MSVC_VERSION 2015