Skip to content

Commit 32d95dd

Browse files
trokytroky
committed
Updated to MSVS 2013
1 parent e481d67 commit 32d95dd

14 files changed

+51
-66
lines changed

‎adl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ void gpu_autotune(int gpu, enum dev_enable *denable)
13101310
bool fan_optimal = true, fan_window = true;
13111311
struct cgpu_info *cgpu;
13121312
struct gpu_adl *ga;
1313-
unsigned int i;
1313+
int i;
13141314

13151315
cgpu = &gpus[gpu];
13161316
ga = &cgpu->adl;

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
33
m4_define([v_maj], [5])
44
m4_define([v_min], [0])
5-
m4_define([v_mic], [0])
5+
m4_define([v_mic], [1])
66
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
77
m4_define([v_ver], [v_maj.v_min.v_mic])
88
m4_define([lt_rev], m4_eval(v_maj + v_min))

‎sgminer.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -8040,7 +8040,7 @@ static void probe_pools(void)
80408040
static void restart_mining_threads(unsigned int new_n_threads)
80418041
{
80428042
struct thr_info *thr;
8043-
unsigned int i, j, k;
8043+
int i, j, k;
80448044

80458045
// Stop and free threads
80468046
if (mining_thr)
@@ -8197,7 +8197,6 @@ int main(int argc, char *argv[])
81978197
struct thr_info *thr;
81988198
struct block *block;
81998199
int i;
8200-
char *s;
82018200

82028201
/* This dangerous function tramples random dynamically allocated
82038202
* variables so do it before anything at all */

‎submodules/jansson

‎winbuild/README.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Tools needed
22
------------
33
1. Windows 7 (if you are using Win 8 or above, you will need to use a VM Win 7)
4-
2. Visual Studio C++ 2010 Express - found at http://www.visualstudio.com/en-us/downloads#d-2010-express
4+
2. Visual Studio C++ 2013 Express - found at http://www.visualstudio.com/en-us/downloads#d-2013-express
55
3. Windows 7.1 SDK - http://www.microsoft.com/en-us/download/details.aspx?id=8279
66

77
If you intend to build for native x64, then instead of using <Visual Studio Command Prompt>, you will need to use
@@ -10,7 +10,7 @@ Windows SDK 7.1 Command Prompt and run "setenv /x64 /Release" before starting to
1010
Also, for x64, after you follow all the steps and you are ready to build. Go to "Project Properties -> VC++ Directories -> Library Directories"
1111
and add this folder to the library list: C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\x64
1212

13-
To run sgminer built using Visual Studios you will need to have Microsoft Visual C++ 2010 Redistributable Package (x86 or x64 depending on your sgminer version) installed.
13+
To run sgminer built using Visual Studios you will need to have Microsoft Visual C++ 2013 Redistributable Package (x86 or x64 depending on your sgminer version) installed.
1414

1515
Installing dependencies
1616
-----------------------
@@ -31,12 +31,12 @@ x64 version:
3131

3232
2. Install AMD APP SDK (OpenCL), latest version
3333
-----------------------------------------------
34-
- go to http://developer.amd.com/tools-and-sdks/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/downloads/ and download appropriate version (x86/x64) and install
34+
- go to http://developer.amd.com/tools-and-sdks/opencl-zone/amd-accelerated-parallel-processing-app-sdk/ and download appropriate version (x86/x64) and install
3535
- copy C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86\OpenCL.lib to winbuild/dist/lib/x86/
3636
- copy C:\Program Files (x86)\AMD APP SDK\2.9\bin\x86\OpenCL.dll to winbuild/dist/dll/x86/
3737
- copy C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86_64\OpenCL.lib to winbuild/dist/lib/x64/
3838
- copy C:\Program Files (x86)\AMD APP SDK\2.9\bin\x86_64\OpenCL.dll to winbuild/dist/dll/x64/
39-
- copy C:\Program Files (x86)\AMD APP SDK\2.9\include\* winbuild/dist/include/
39+
- copy C:\Program Files (x86)\AMD APP SDK\2.9\include\CL\* winbuild/dist/include/CL/
4040

4141

4242
3. PDCurses
@@ -67,20 +67,20 @@ x64 version:
6767

6868
4. Curl
6969
-------
70-
- go to http://curl.haxx.se/download.html and download latest source and extract it somewhere
70+
- go to http://curl.haxx.se/download.html and download latest source (>=7.39.0) and extract it somewhere
7171
- replace original curl winbuild\MakefileBuild.vc with provided winbuild\MakefileBuild.vc (corrected paths and static library names for VC)
7272

7373
x86 version:
7474
- open Visual Studio Command Prompt (x86)
7575
- go to winbuild folder and execute:
76-
nmake -f Makefile.vc mode=static VC=10 WITH_DEVEL=C:\OpenSSL-Win32 WITH_SSL=static ENABLE_SSPI=no ENABLE_IPV6=no ENABLE_IDN=no GEN_PDB=no DEBUG=no MACHINE=x86
76+
nmake -f Makefile.vc mode=static VC=13 WITH_DEVEL=C:\OpenSSL-Win32 WITH_SSL=static ENABLE_SSPI=no ENABLE_IPV6=no ENABLE_IDN=no GEN_PDB=no DEBUG=no MACHINE=x86
7777
- copy builds\libcurl-vc10-x86-release-static-ssl-static-spnego\lib\libcurl_a.lib to winbuild\dist\lib\x86
78-
- copy builds\libcurl-vc10-x86-release-static-ssl-static-spnego\include\* winbuild\dist\include\
78+
- copy builds \libcurl-vc10-x86-release-static-ssl-static-spnego\include\* winbuild\dist\include\
7979

8080
x64 version:
8181
- open Visual Studio Command Prompt (x64)
8282
- go to winbuild folder and execute:
83-
nmake -f Makefile.vc mode=static VC=10 WITH_DEVEL=C:\OpenSSL-Win64 WITH_SSL=static ENABLE_SSPI=no ENABLE_IPV6=no ENABLE_IDN=no GEN_PDB=no DEBUG=no MACHINE=x64
83+
nmake -f Makefile.vc mode=static VC=13 WITH_DEVEL=C:\OpenSSL-Win64 WITH_SSL=static ENABLE_SSPI=no ENABLE_IPV6=no ENABLE_IDN=no GEN_PDB=no DEBUG=no MACHINE=x64
8484
- copy builds\libcurl-vc10-x64-release-static-ssl-static-spnego\lib\libcurl_a.lib to winbuild\dist\lib\x64
8585
- copy builds\libcurl-vc10-x64-release-static-ssl-static-spnego\include\* winbuild\dist\include\
8686

‎winbuild/dist/include/config.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949

5050
#define PATH_MAX MAX_PATH
5151

52-
#define R_OK 0
53-
5452
// Libraries to include
5553
#pragma comment(lib, "winmm.lib")
5654
#pragma comment(lib, "wsock32.lib")
@@ -69,11 +67,11 @@
6967

7068
#endif
7169

72-
#define VERSION "v5.0.0"
70+
#define VERSION "v5.0.1"
7371
#define PACKAGE_NAME "sgminer"
7472
#define PACKAGE_TARNAME "sgminer"
75-
#define PACKAGE_VERSION "5.0.0"
76-
#define PACKAGE_STRING "sgminer 5.0.0"
73+
#define PACKAGE_VERSION "5.0.1"
74+
#define PACKAGE_STRING "sgminer 5.0.1"
7775
#define PACKAGE "sgminer"
7876

7977
#define SGMINER_PREFIX ""

‎winbuild/dist/include/curl/.gitignore

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
1-
curl.h
2-
curlbuild.h
3-
curlrules.h
4-
curlver.h
5-
easy.h
6-
mprintf.h
7-
multi.h
8-
stdcheaders.h
9-
typecheck-gcc.h
10-
1+
*
2+
!.gitignore

‎winbuild/dist/include/curl/README.txt

-1
This file was deleted.

‎winbuild/dist/include/jansson_config.h

-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
* as we will also check for __int64 etc types.
2626
* (the definition was used in the automake system) */
2727

28-
/* Bring in the cmake-detected defines */
29-
#define HAVE_STDINT_H 1
30-
/* #undef HAVE_INTTYPES_H */
31-
/* #undef HAVE_SYS_TYPES_H */
32-
3328
/* Include our standard type header for the integer typedef */
3429

3530
#if defined(HAVE_STDINT_H)

‎winbuild/dist/include/winbuild.h

-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ inline void* memmem (void* buf, size_t buflen, void* pat, size_t patlen)
131131
return 0;
132132
}
133133

134-
#define va_copy(a, b) memcpy(&(a), &(b), sizeof(va_list))
135-
136134
#define usleep(x) Sleep((x)/1000)
137135
#define sleep(x) Sleep((x)*1000)
138136

‎winbuild/jansson/jansson.vcxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -27,23 +27,27 @@
2727
<ConfigurationType>StaticLibrary</ConfigurationType>
2828
<UseDebugLibraries>true</UseDebugLibraries>
2929
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v120</PlatformToolset>
3031
</PropertyGroup>
3132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3233
<ConfigurationType>StaticLibrary</ConfigurationType>
3334
<UseDebugLibraries>true</UseDebugLibraries>
3435
<CharacterSet>MultiByte</CharacterSet>
36+
<PlatformToolset>v120</PlatformToolset>
3537
</PropertyGroup>
3638
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3739
<ConfigurationType>StaticLibrary</ConfigurationType>
3840
<UseDebugLibraries>false</UseDebugLibraries>
3941
<WholeProgramOptimization>true</WholeProgramOptimization>
4042
<CharacterSet>MultiByte</CharacterSet>
43+
<PlatformToolset>v120</PlatformToolset>
4144
</PropertyGroup>
4245
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4346
<ConfigurationType>StaticLibrary</ConfigurationType>
4447
<UseDebugLibraries>false</UseDebugLibraries>
4548
<WholeProgramOptimization>true</WholeProgramOptimization>
4649
<CharacterSet>MultiByte</CharacterSet>
50+
<PlatformToolset>v120</PlatformToolset>
4751
</PropertyGroup>
4852
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4953
<ImportGroup Label="ExtensionSettings">

‎winbuild/jansson/jansson.vcxproj.filters

+18-18
Original file line numberDiff line numberDiff line change
@@ -15,60 +15,60 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="..\..\compat\jansson\src\dump.c">
18+
<ClCompile Include="..\..\submodules\jansson\src\dump.c">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\..\compat\jansson\src\error.c">
21+
<ClCompile Include="..\..\submodules\jansson\src\error.c">
2222
<Filter>Source Files</Filter>
2323
</ClCompile>
24-
<ClCompile Include="..\..\compat\jansson\src\hashtable.c">
24+
<ClCompile Include="..\..\submodules\jansson\src\hashtable.c">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\..\compat\jansson\src\hashtable_seed.c">
27+
<ClCompile Include="..\..\submodules\jansson\src\hashtable_seed.c">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\..\compat\jansson\src\load.c">
30+
<ClCompile Include="..\..\submodules\jansson\src\load.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\..\compat\jansson\src\memory.c">
33+
<ClCompile Include="..\..\submodules\jansson\src\memory.c">
3434
<Filter>Source Files</Filter>
3535
</ClCompile>
36-
<ClCompile Include="..\..\compat\jansson\src\pack_unpack.c">
36+
<ClCompile Include="..\..\submodules\jansson\src\pack_unpack.c">
3737
<Filter>Source Files</Filter>
3838
</ClCompile>
39-
<ClCompile Include="..\..\compat\jansson\src\strbuffer.c">
39+
<ClCompile Include="..\..\submodules\jansson\src\strbuffer.c">
4040
<Filter>Source Files</Filter>
4141
</ClCompile>
42-
<ClCompile Include="..\..\compat\jansson\src\strconv.c">
42+
<ClCompile Include="..\..\submodules\jansson\src\strconv.c">
4343
<Filter>Source Files</Filter>
4444
</ClCompile>
45-
<ClCompile Include="..\..\compat\jansson\src\utf.c">
45+
<ClCompile Include="..\..\submodules\jansson\src\utf.c">
4646
<Filter>Source Files</Filter>
4747
</ClCompile>
48-
<ClCompile Include="..\..\compat\jansson\src\value.c">
48+
<ClCompile Include="..\..\submodules\jansson\src\value.c">
4949
<Filter>Source Files</Filter>
5050
</ClCompile>
5151
</ItemGroup>
5252
<ItemGroup>
53-
<ClInclude Include="..\..\compat\jansson\src\hashtable.h">
53+
<ClInclude Include="jansson_config.h">
5454
<Filter>Header Files</Filter>
5555
</ClInclude>
56-
<ClInclude Include="..\..\compat\jansson\src\jansson.h">
56+
<ClInclude Include="jansson_private_config.h">
5757
<Filter>Header Files</Filter>
5858
</ClInclude>
59-
<ClInclude Include="..\..\compat\jansson\src\jansson_private.h">
59+
<ClInclude Include="..\..\submodules\jansson\src\hashtable.h">
6060
<Filter>Header Files</Filter>
6161
</ClInclude>
62-
<ClInclude Include="..\..\compat\jansson\src\strbuffer.h">
62+
<ClInclude Include="..\..\submodules\jansson\src\jansson.h">
6363
<Filter>Header Files</Filter>
6464
</ClInclude>
65-
<ClInclude Include="..\..\compat\jansson\src\utf.h">
65+
<ClInclude Include="..\..\submodules\jansson\src\jansson_private.h">
6666
<Filter>Header Files</Filter>
6767
</ClInclude>
68-
<ClInclude Include="jansson_config.h">
68+
<ClInclude Include="..\..\submodules\jansson\src\strbuffer.h">
6969
<Filter>Header Files</Filter>
7070
</ClInclude>
71-
<ClInclude Include="jansson_private_config.h">
71+
<ClInclude Include="..\..\submodules\jansson\src\utf.h">
7272
<Filter>Header Files</Filter>
7373
</ClInclude>
7474
</ItemGroup>

‎winbuild/sgminer.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
3030
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>v100</PlatformToolset>
31+
<PlatformToolset>v120</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
3636
<CharacterSet>MultiByte</CharacterSet>
37-
<PlatformToolset>v100</PlatformToolset>
37+
<PlatformToolset>v120</PlatformToolset>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
<CharacterSet>MultiByte</CharacterSet>
44-
<PlatformToolset>v100</PlatformToolset>
44+
<PlatformToolset>v120</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
4949
<WholeProgramOptimization>true</WholeProgramOptimization>
5050
<CharacterSet>MultiByte</CharacterSet>
51-
<PlatformToolset>v100</PlatformToolset>
51+
<PlatformToolset>v120</PlatformToolset>
5252
</PropertyGroup>
5353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5454
<ImportGroup Label="ExtensionSettings">

‎winbuild/sgminer.vcxproj.filters

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
<ClCompile Include="..\logging.c">
4848
<Filter>Source Files</Filter>
4949
</ClCompile>
50-
<ClCompile Include="..\ocl.c">
51-
<Filter>Source Files</Filter>
52-
</ClCompile>
5350
<ClCompile Include="..\sgminer.c">
5451
<Filter>Source Files</Filter>
5552
</ClCompile>
@@ -71,9 +68,6 @@
7168
<ClCompile Include="..\pool.c">
7269
<Filter>Source Files</Filter>
7370
</ClCompile>
74-
<ClCompile Include="..\algorithm.c">
75-
<Filter>Source Files</Filter>
76-
</ClCompile>
7771
<ClCompile Include="..\sph\aes_helper.c">
7872
<Filter>Source Files\sph</Filter>
7973
</ClCompile>
@@ -197,6 +191,12 @@
197191
<ClCompile Include="..\sph\whirlpool.c">
198192
<Filter>Source Files\sph</Filter>
199193
</ClCompile>
194+
<ClCompile Include="..\ocl.c">
195+
<Filter>Source Files</Filter>
196+
</ClCompile>
197+
<ClCompile Include="..\algorithm.c">
198+
<Filter>Source Files</Filter>
199+
</ClCompile>
200200
</ItemGroup>
201201
<ItemGroup>
202202
<ClInclude Include="..\adl.h">

0 commit comments

Comments
 (0)