diff --git a/adl.c b/adl.c index b71dd730..dbc66c83 100644 --- a/adl.c +++ b/adl.c @@ -1310,7 +1310,7 @@ void gpu_autotune(int gpu, enum dev_enable *denable) bool fan_optimal = true, fan_window = true; struct cgpu_info *cgpu; struct gpu_adl *ga; - unsigned int i; + int i; cgpu = &gpus[gpu]; ga = &cgpu->adl; diff --git a/configure.ac b/configure.ac index f623df6c..37cac960 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [5]) m4_define([v_min], [0]) -m4_define([v_mic], [0]) +m4_define([v_mic], [1]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_ver], [v_maj.v_min.v_mic]) m4_define([lt_rev], m4_eval(v_maj + v_min)) diff --git a/sgminer.c b/sgminer.c index 84ec2486..391fbc08 100644 --- a/sgminer.c +++ b/sgminer.c @@ -8040,7 +8040,7 @@ static void probe_pools(void) static void restart_mining_threads(unsigned int new_n_threads) { struct thr_info *thr; - unsigned int i, j, k; + int i, j, k; // Stop and free threads if (mining_thr) @@ -8197,7 +8197,6 @@ int main(int argc, char *argv[]) struct thr_info *thr; struct block *block; int i; - char *s; /* This dangerous function tramples random dynamically allocated * variables so do it before anything at all */ diff --git a/submodules/jansson b/submodules/jansson index df248712..bc743ad2 160000 --- a/submodules/jansson +++ b/submodules/jansson @@ -1 +1 @@ -Subproject commit df248712a5d982b0721b6e8d15b09d4a9264301e +Subproject commit bc743ad2d9807b00e7dc0b5d3524d0a47a14f3c3 diff --git a/winbuild/README.txt b/winbuild/README.txt index eea3c6ba..a455081a 100644 --- a/winbuild/README.txt +++ b/winbuild/README.txt @@ -1,7 +1,7 @@ Tools needed ------------ 1. Windows 7 (if you are using Win 8 or above, you will need to use a VM Win 7) -2. Visual Studio C++ 2010 Express - found at http://www.visualstudio.com/en-us/downloads#d-2010-express +2. Visual Studio C++ 2013 Express - found at http://www.visualstudio.com/en-us/downloads#d-2013-express 3. Windows 7.1 SDK - http://www.microsoft.com/en-us/download/details.aspx?id=8279 If you intend to build for native x64, then instead of using , you will need to use @@ -10,7 +10,7 @@ Windows SDK 7.1 Command Prompt and run "setenv /x64 /Release" before starting to Also, for x64, after you follow all the steps and you are ready to build. Go to "Project Properties -> VC++ Directories -> Library Directories" and add this folder to the library list: C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\x64 -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. +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. Installing dependencies ----------------------- @@ -31,12 +31,12 @@ x64 version: 2. Install AMD APP SDK (OpenCL), latest version ----------------------------------------------- -- 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 +- 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 - copy C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86\OpenCL.lib to winbuild/dist/lib/x86/ - copy C:\Program Files (x86)\AMD APP SDK\2.9\bin\x86\OpenCL.dll to winbuild/dist/dll/x86/ - copy C:\Program Files (x86)\AMD APP SDK\2.9\lib\x86_64\OpenCL.lib to winbuild/dist/lib/x64/ - copy C:\Program Files (x86)\AMD APP SDK\2.9\bin\x86_64\OpenCL.dll to winbuild/dist/dll/x64/ -- copy C:\Program Files (x86)\AMD APP SDK\2.9\include\* winbuild/dist/include/ +- copy C:\Program Files (x86)\AMD APP SDK\2.9\include\CL\* winbuild/dist/include/CL/ 3. PDCurses @@ -67,20 +67,20 @@ x64 version: 4. Curl ------- -- go to http://curl.haxx.se/download.html and download latest source and extract it somewhere +- go to http://curl.haxx.se/download.html and download latest source (>=7.39.0) and extract it somewhere - replace original curl winbuild\MakefileBuild.vc with provided winbuild\MakefileBuild.vc (corrected paths and static library names for VC) x86 version: - open Visual Studio Command Prompt (x86) - go to winbuild folder and execute: - 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 + 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 - copy builds\libcurl-vc10-x86-release-static-ssl-static-spnego\lib\libcurl_a.lib to winbuild\dist\lib\x86 - - copy builds\libcurl-vc10-x86-release-static-ssl-static-spnego\include\* winbuild\dist\include\ + - copy builds \libcurl-vc10-x86-release-static-ssl-static-spnego\include\* winbuild\dist\include\ x64 version: - open Visual Studio Command Prompt (x64) - go to winbuild folder and execute: - 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 + 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 - copy builds\libcurl-vc10-x64-release-static-ssl-static-spnego\lib\libcurl_a.lib to winbuild\dist\lib\x64 - copy builds\libcurl-vc10-x64-release-static-ssl-static-spnego\include\* winbuild\dist\include\ diff --git a/winbuild/dist/include/config.h b/winbuild/dist/include/config.h index 487d58cc..3d41858c 100644 --- a/winbuild/dist/include/config.h +++ b/winbuild/dist/include/config.h @@ -49,8 +49,6 @@ #define PATH_MAX MAX_PATH -#define R_OK 0 - // Libraries to include #pragma comment(lib, "winmm.lib") #pragma comment(lib, "wsock32.lib") @@ -69,11 +67,11 @@ #endif -#define VERSION "v5.0.0" +#define VERSION "v5.0.1" #define PACKAGE_NAME "sgminer" #define PACKAGE_TARNAME "sgminer" -#define PACKAGE_VERSION "5.0.0" -#define PACKAGE_STRING "sgminer 5.0.0" +#define PACKAGE_VERSION "5.0.1" +#define PACKAGE_STRING "sgminer 5.0.1" #define PACKAGE "sgminer" #define SGMINER_PREFIX "" diff --git a/winbuild/dist/include/curl/.gitignore b/winbuild/dist/include/curl/.gitignore index 940882f0..d6b7ef32 100644 --- a/winbuild/dist/include/curl/.gitignore +++ b/winbuild/dist/include/curl/.gitignore @@ -1,10 +1,2 @@ -curl.h -curlbuild.h -curlrules.h -curlver.h -easy.h -mprintf.h -multi.h -stdcheaders.h -typecheck-gcc.h - +* +!.gitignore diff --git a/winbuild/dist/include/curl/README.txt b/winbuild/dist/include/curl/README.txt deleted file mode 100644 index 78dbf6d8..00000000 --- a/winbuild/dist/include/curl/README.txt +++ /dev/null @@ -1 +0,0 @@ -Curl installation instructions can be found in winbuild/README.txt. \ No newline at end of file diff --git a/winbuild/dist/include/jansson_config.h b/winbuild/dist/include/jansson_config.h index 85269998..043075f8 100644 --- a/winbuild/dist/include/jansson_config.h +++ b/winbuild/dist/include/jansson_config.h @@ -25,11 +25,6 @@ * as we will also check for __int64 etc types. * (the definition was used in the automake system) */ -/* Bring in the cmake-detected defines */ -#define HAVE_STDINT_H 1 -/* #undef HAVE_INTTYPES_H */ -/* #undef HAVE_SYS_TYPES_H */ - /* Include our standard type header for the integer typedef */ #if defined(HAVE_STDINT_H) diff --git a/winbuild/dist/include/winbuild.h b/winbuild/dist/include/winbuild.h index c4b587c7..fe15b607 100644 --- a/winbuild/dist/include/winbuild.h +++ b/winbuild/dist/include/winbuild.h @@ -131,8 +131,6 @@ inline void* memmem (void* buf, size_t buflen, void* pat, size_t patlen) return 0; } -#define va_copy(a, b) memcpy(&(a), &(b), sizeof(va_list)) - #define usleep(x) Sleep((x)/1000) #define sleep(x) Sleep((x)*1000) diff --git a/winbuild/jansson/jansson.vcxproj b/winbuild/jansson/jansson.vcxproj index 8f70efd3..9807ac15 100644 --- a/winbuild/jansson/jansson.vcxproj +++ b/winbuild/jansson/jansson.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,23 +27,27 @@ StaticLibrary true MultiByte + v120 StaticLibrary true MultiByte + v120 StaticLibrary false true MultiByte + v120 StaticLibrary false true MultiByte + v120 diff --git a/winbuild/jansson/jansson.vcxproj.filters b/winbuild/jansson/jansson.vcxproj.filters index caa51abb..261a4298 100644 --- a/winbuild/jansson/jansson.vcxproj.filters +++ b/winbuild/jansson/jansson.vcxproj.filters @@ -15,60 +15,60 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/winbuild/sgminer.vcxproj b/winbuild/sgminer.vcxproj index 4ff22ec4..e778b6e4 100644 --- a/winbuild/sgminer.vcxproj +++ b/winbuild/sgminer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,27 +28,27 @@ Application true MultiByte - v100 + v120 Application true MultiByte - v100 + v120 Application false true MultiByte - v100 + v120 Application false true MultiByte - v100 + v120 diff --git a/winbuild/sgminer.vcxproj.filters b/winbuild/sgminer.vcxproj.filters index c8d0b45e..68d73780 100644 --- a/winbuild/sgminer.vcxproj.filters +++ b/winbuild/sgminer.vcxproj.filters @@ -47,9 +47,6 @@ Source Files - - Source Files - Source Files @@ -71,9 +68,6 @@ Source Files - - Source Files - Source Files\sph @@ -197,6 +191,12 @@ Source Files\sph + + Source Files + + + Source Files +