From ba9b052545aebc47e9118a0d9336102d04ed2c1c Mon Sep 17 00:00:00 2001 From: enWILLYado Date: Sun, 18 Feb 2018 01:01:58 +0100 Subject: [PATCH] Include win32 compilation --- src/Cpu_unix.cpp | 4 ++++ src/crypto/CryptoNight_x86.h | 9 +++++++++ vs/xmrig.vcxproj | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/src/Cpu_unix.cpp b/src/Cpu_unix.cpp index 33fe0ea1..432913fc 100644 --- a/src/Cpu_unix.cpp +++ b/src/Cpu_unix.cpp @@ -29,6 +29,7 @@ # include #endif +#include #include #include @@ -56,6 +57,8 @@ void Cpu::init() void Cpu::setAffinity(int id, uint64_t mask) { +#if __GNU_VISIBLE && defined(__rtems__) + cpu_set_t set; CPU_ZERO(&set); @@ -81,5 +84,6 @@ void Cpu::setAffinity(int id, uint64_t mask) sched_setaffinity(gettid(), sizeof(&set), &set); # endif } +#endif } #endif \ No newline at end of file diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h index b94e7000..12dd0524 100644 --- a/src/crypto/CryptoNight_x86.h +++ b/src/crypto/CryptoNight_x86.h @@ -316,6 +316,15 @@ static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output) _mm_store_si128(output + 11, xout7); } +#if ! defined _WIN64 && defined _WIN32 +static inline __m128i _mm_set_epi64x(const uint64_t __a, const uint64_t __b) +{ + __m128i ret; + ret.m128i_u64[1] = __a; + ret.m128i_u64[0] = __b; + return ret; +} +#endif template inline void cryptonight_hash(const void* __restrict__ input, size_t size, void* __restrict__ output, diff --git a/vs/xmrig.vcxproj b/vs/xmrig.vcxproj index e0c114b3..5f8f4207 100644 --- a/vs/xmrig.vcxproj +++ b/vs/xmrig.vcxproj @@ -252,6 +252,12 @@ cd $(OutDir) && make -j$(NUMBER_OF_PROCESSORS) cd $(OutDir) && make clean && make -j$(NUMBER_OF_PROCESSORS) cd $(OutDir) && make clean + $(SolutionDir)\..\build\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\ + $(ProjectName)$(Platform)d + $(ProjectName)$(Platform) + $(SolutionDir)\obj\$(Platform)\$(Configuration)\ + $(SolutionDir)\..\build\