fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include win32 compilation

Browse source
This commit is contained in:
enWILLYado 2018-02-18 01:01:58 +01:00
parent 372f957e4a
commit ba9b052545
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Cpu_unix.cpp
View file

@ -29,6 +29,7 @@
# include <pthread_np.h> # include <pthread_np.h>
#endif #endif
#include <sched.h>
#include <pthread.h> #include <pthread.h>
#include <sched.h> #include <sched.h>
@ -56,6 +57,8 @@ void Cpu::init()
void Cpu::setAffinity(int id, uint64_t mask) void Cpu::setAffinity(int id, uint64_t mask)
{ {
#if __GNU_VISIBLE && defined(__rtems__)
cpu_set_t set; cpu_set_t set;
CPU_ZERO(&set); CPU_ZERO(&set);
@ -81,5 +84,6 @@ void Cpu::setAffinity(int id, uint64_t mask)
sched_setaffinity(gettid(), sizeof(&set), &set); sched_setaffinity(gettid(), sizeof(&set), &set);
# endif # endif
} }
#endif
} }
#endif #endif

9
src/crypto/CryptoNight_x86.h
View file

@ -316,6 +316,15 @@ static inline void cn_implode_scratchpad(const __m128i* input, __m128i* output)
_mm_store_si128(output + 11, xout7); _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<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES> template<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES>
inline void cryptonight_hash(const void* __restrict__ input, size_t size, void* __restrict__ output, inline void cryptonight_hash(const void* __restrict__ input, size_t size, void* __restrict__ output,

6
vs/xmrig.vcxproj
View file

@ -252,6 +252,12 @@
<NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeBuildCommandLine> <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make clean &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make clean &amp;&amp; make -j$(NUMBER_OF_PROCESSORS)</NMakeReBuildCommandLine>
<NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make clean</NMakeCleanCommandLine> <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='make|x64'">cd $(OutDir) &amp;&amp; make clean</NMakeCleanCommandLine>
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(SolutionDir)\..\build\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='vc-debug|Win32'">$(ProjectName)$(Platform)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(ProjectName)$(Platform)</TargetName>
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(SolutionDir)\obj\$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc-release|Win32'">$(SolutionDir)\..\build\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='make|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='make|Win32'">
<ClCompile> <ClCompile>