From 71c4e937aeb0a202ea577b52656b68002ba33291 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 10 Nov 2017 20:51:25 +0000 Subject: [PATCH] fix win build --- CMakeLists.txt | 4 ++-- xmrstak/version.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0faa56d..491d7e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -379,10 +379,10 @@ execute_process( ) if(NOT "${GIT_COMMIT_HASH}" STREQUAL "") - add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"") + add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}") endif() if(NOT "${GIT_BRANCH}" STREQUAL "") - add_definitions("-DGIT_BRANCH=\"${GIT_BRANCH}\"") + add_definitions("-DGIT_BRANCH=${GIT_BRANCH}") endif() diff --git a/xmrstak/version.hpp b/xmrstak/version.hpp index 72df50b..2bf38d5 100644 --- a/xmrstak/version.hpp +++ b/xmrstak/version.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include "donate-level.hpp" @@ -8,7 +9,7 @@ extern const char ver_short[]; inline std::string get_version_str() { - return std::string(ver_long) + std::to_string(uint(fDevDonationLevel * 1000)) ; + return std::string(ver_long) + std::to_string(uint32_t(fDevDonationLevel * 1000)) ; } inline std::string get_version_str_short()