diff --git a/README.txt b/README.txt index 3a9cd03..37490e7 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -ccMiner release 1.6.4-tpruvot (May 2015) - "Multi-pools config" +ccMiner release 1.6.5-tpruvot (Jun 2015) "PoK, clocks & Cuda 7" --------------------------------------------------------------- *************************************************************** @@ -218,12 +218,15 @@ features. >>> RELEASE HISTORY <<< - June 2015 v1.6.5 + June 23th 2015 v1.6.5 + Handle Ziftrcoin PoK solo mining + Basic compatibility with CUDA 7.0 (generally slower hashrate) + Show gpus vendor names on linux (windows test branch is pciutils) Remove -v and -m short params specific to heavycoin Add --diff-multiplier (-m) and rename --diff to --diff-factor (-f) - Some fixes for default pool params values (multipool) First steps to handle nvml application clocks and P0 on the GTX9xx - Optimize qubit, deep and luffa algos + Various improvements on multipool and cmdline parameters + Optimize a bit qubit, deep, luffa, x11 and quark algos May 26th 2015 v1.6.4 Implement multi-pool support (failover and time rotate) diff --git a/ccminer.cpp b/ccminer.cpp index 49a0ca9..84fc3cf 100644 --- a/ccminer.cpp +++ b/ccminer.cpp @@ -343,10 +343,10 @@ Options:\n\ --max-temp=N Only mine if gpu temp is less than specified value\n\ --max-rate=N[KMG] Only mine if net hashrate is less than specified value\n\ --max-diff=N Only mine if net difficulty is less than specified value\n" -#if defined(USE_WRAPNVML) && defined(__linux) +#if defined(USE_WRAPNVML) && (defined(__linux) || defined(_WIN64)) "\ --gpu-clock=1150 Set device application clock\n\ - --mem-clock=3505 Set the gpu memory clock (require 346.72 linux driver)\n" + --mem-clock=3505 Set the gpu memory clock (require 346.72+ driver)\n" #endif #ifdef HAVE_SYSLOG_H "\ diff --git a/configure.ac b/configure.ac index 6b6b249..00834e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ccminer], [1.6.5-git]) +AC_INIT([ccminer], [1.6.5]) AC_PREREQ([2.59c]) AC_CANONICAL_SYSTEM diff --git a/cpuminer-config.h b/cpuminer-config.h index 4ede926..a3ae277 100644 --- a/cpuminer-config.h +++ b/cpuminer-config.h @@ -47,6 +47,9 @@ /* Define to 1 if you have the `ssl' library (-lssl). */ #define HAVE_LIBSSL 1 +/* Define to 1 if you have the `z' library (-lz). */ +#define HAVE_LIBZ 1 + /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -159,7 +162,7 @@ #define PACKAGE_NAME "ccminer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ccminer 1.6.5-git" +#define PACKAGE_STRING "ccminer 1.6.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ccminer" @@ -168,7 +171,7 @@ #define PACKAGE_URL "http://github.com/tpruvot/ccminer" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.5-git" +#define PACKAGE_VERSION "1.6.5" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -182,7 +185,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.6.5-git" +#define VERSION "1.6.5" /* Define curl_free() as free() if our version of curl lacks curl_free. */ /* #undef curl_free */ diff --git a/res/ccminer.rc b/res/ccminer.rc index 50e850a..60cb9a8 100644 --- a/res/ccminer.rc +++ b/res/ccminer.rc @@ -60,8 +60,8 @@ IDI_ICON1 ICON "ccminer.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,6,4,0 - PRODUCTVERSION 1,6,4,0 + FILEVERSION 1,6,5,0 + PRODUCTVERSION 1,6,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L @@ -76,10 +76,10 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "FileVersion", "1.6.4" + VALUE "FileVersion", "1.6.5" VALUE "LegalCopyright", "Copyright (C) 2015" VALUE "ProductName", "ccminer" - VALUE "ProductVersion", "1.6.4" + VALUE "ProductVersion", "1.6.5" END END BLOCK "VarFileInfo"