fix win build

This commit is contained in:
Unknown
2017-11-10 21:18:01 +00:00
parent 8f52eb85b3
commit 71c4e937ae
2 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -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()
+2 -1
View File
@@ -1,5 +1,6 @@
#pragma once
#include <inttypes.h>
#include <string>
#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()