Skip to content

Commit

Permalink
x86 Build is fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
jonano614 committed Jan 28, 2018
1 parent 7b9d87b commit c723b75
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 18 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ GpuMiner/GpuMiner.vcxproj.user
GpuMiner/version.aps
/params.txt
/GpuMiner/Release/
/Release/
/Debug/
/GpuMiner/Debug/
14 changes: 10 additions & 4 deletions GpuMiner/GpuMiner.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CL_USE_DEPRECATED_OPENCL_2_0_APIS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0601;USE_OPENSSL_SHA</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(OPENCL_SDK)\lib\x86_64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OPENCL_SDK)\lib\x86</AdditionalLibraryDirectories>
<AdditionalDependencies>OpenCL.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
Expand Down Expand Up @@ -110,15 +110,20 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>$(OPENCL_SDK)\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CL_USE_DEPRECATED_OPENCL_2_0_APIS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0601;USE_OPENSSL_SHA</PreprocessorDefinitions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Fast</FloatingPointModel>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(OPENCL_SDK)\lib\x86_64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OPENCL_SDK)\lib\x86</AdditionalLibraryDirectories>
<AdditionalDependencies>OpenCL.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>No</GenerateDebugInformation>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>copy HashCL\CLMiner_kernel.cl "$(OutDir)CLMiner_kernel.cl" /Y</Command>
Expand All @@ -130,11 +135,12 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<SDLCheck>false</SDLCheck>
<AdditionalIncludeDirectories>$(OPENCL_SDK)\include;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CL_USE_DEPRECATED_OPENCL_2_0_APIS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WIN32_WINNT=0x0601;USE_OPENSSL_SHA</PreprocessorDefinitions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<FloatingPointModel>Fast</FloatingPointModel>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
Expand Down
14 changes: 0 additions & 14 deletions GpuMiner/XDagCore/win/system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,6 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
return 0;
}

#if !defined(_WIN64)
__declspec(noreturn) void __cdecl __report_rangecheckfailure(void)
{
fprintf(stderr, "Fatal error: openssl range check failure!\n");
fflush(stderr);
_exit(0);
}
#else
FILE *__iob_func(void)
{
return stdin;
}
#endif

int inet_aton(const char *cp, struct in_addr *inp)
{
int a, b, c, d;
Expand Down

0 comments on commit c723b75

Please sign in to comment.