From 749daa7b1705236c7214c40e3065db4df0c0a269 Mon Sep 17 00:00:00 2001
From: samr7 <samr7@cs.washington.edu>
Date: Mon, 1 Aug 2011 23:17:28 -0700
Subject: [PATCH] Bump version to 0.16. Use stdio binary mode when
 reading/writing kernel binaries. Fix up help message for oclvanitygen.

---
 CHANGELOG      | 12 ++++++++++++
 INSTALL        | 26 ++++++++++++++++++++++----
 oclvanitygen.c | 12 ++++++++----
 vanitygen.c    |  2 +-
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0195526..c2aa329 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,3 +57,15 @@ Version 0.12, released July 13 2011:
 Version 0.13, released July 17 2011:
 	- Display hints when handling impossible prefixes
 	- Reorganize source tree
+
+Version 0.14, released July 31 2011:
+	- Fix namecoin private address type (patch from jackjack-jj)
+
+Version 0.15, released August 1 2011:
+	- Tweaks/improvements to oclvanitygen
+	- Add oclvanitygen warning for NVIDIA Windows drivers not known to work
+
+Version 0.16, released August 2 2011:
+	- Performance tweaks to oclvanitygen kernel
+	- Add safe mode flag (-S) to oclvanitygen to disable optimizations
+	- Add -X flag to set numerical key type (patch from jackjack-jj)
diff --git a/INSTALL b/INSTALL
index a818d6b..36a21dd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,25 @@
 Linux:
-make vanitygen
-make oclvanitygen
+make vanitygen oclvanitygen
 
 OSX:
-make -f Makefile.osx vanitygen
-make -f Makefile.osx vanitygen
\ No newline at end of file
+make -f Makefile.osx vanitygen oclvanitygen
+
+Windows:
+Tools: Microsoft Visual Studio 2010, Visual C++
+Prerequisites:
+  - OpenSSL 1.0.0d: http://www.slproweb.com/products/Win32OpenSSL.html
+  - pthreads-Win32: http://sourceware.org/pthreads-win32/
+  - PCRE: http://www.psyon.org/projects/pcre-win32/
+  - AMD APP SDK -or- NVIDIA CUDA SDK
+
+Once you have set up these components, edit the Makefile.Win32 to 
+include the paths where these components are located.
+
+Note that pthreads and PCRE may be built as static libraries or DLLs.  
+The default Makefile includes CFLAGS to link the static versions of 
+those libraries.  If you want to link against DLLs, make sure to change 
+the CFLAGS.
+
+Then, open a Visual Studio command prompt window, and run:
+
+nmake /fMakefile.Win32 vanitygen.exe oclvanitygen.exe
diff --git a/oclvanitygen.c b/oclvanitygen.c
index 986d73b..bd28d23 100644
--- a/oclvanitygen.c
+++ b/oclvanitygen.c
@@ -40,7 +40,7 @@
 #include "pattern.h"
 
 
-const char *version = "0.15";
+const char *version = "0.16";
 const int debug = 0;
 
 #define MAX_SLOT 2
@@ -474,7 +474,7 @@ vg_ocl_load_program(vg_context_t *vcp, vg_ocl_context_t *vocp,
 		 prog_hash[8], prog_hash[9], prog_hash[10], prog_hash[11],
 		 prog_hash[12], prog_hash[13], prog_hash[14], prog_hash[15]);
 
-	kfp = fopen(bin_name, "r");
+	kfp = fopen(bin_name, "rb");
 	if (!kfp) {
 		/* No binary available, create with source */
 		fromsource = 1;
@@ -520,6 +520,9 @@ vg_ocl_load_program(vg_context_t *vcp, vg_ocl_context_t *vocp,
 		return 0;
 	}
 
+	if (vcp->vc_verbose > 1)
+		printf("OpenCL compiler flags: %s\n", opts ? opts : "");
+
 	if (vcp->vc_verbose > 0) {
 		if (fromsource) {
 			printf("Compiling kernel...");
@@ -579,7 +582,7 @@ vg_ocl_load_program(vg_context_t *vcp, vg_ocl_context_t *vocp,
 			goto out;
 		}
 
-		kfp = fopen(bin_name, "w");
+		kfp = fopen(bin_name, "wb");
 		if (!kfp) {
 			printf("WARNING: could not save CL kernel binary: %s\n",
 			       strerror(errno));
@@ -1943,7 +1946,7 @@ usage(const char *name)
 {
 	printf(
 "oclVanitygen %s (" OPENSSL_VERSION_TEXT ")\n"
-"Usage: %s [-vqrikNT] [-t <threads>] [-f <filename>|-] [<pattern>...]\n"
+"Usage: %s [-vqrikNTS] [-d <device>] [-f <filename>|-] [<pattern>...]\n"
 "Generates a bitcoin receiving address matching <pattern>, and outputs the\n"
 "address and associated private key.  The private key may be stored in a safe\n"
 "location or imported into a bitcoin client to spend any balance received on\n"
@@ -1962,6 +1965,7 @@ usage(const char *name)
 "-X <version>  Generate address with the given version\n"
 "-p <platform> Select OpenCL platform\n"
 "-d <device>   Select OpenCL device\n"
+"-S            Safe mode, disable OpenCL loop unrolling optimizations\n"
 "-w <worksize> Set target thread count per multiprocessor\n"
 "-g <x>x<y>    Set grid size\n"
 "-b <invsize>  Set modular inverse ops per thread\n"
diff --git a/vanitygen.c b/vanitygen.c
index 77606b2..185174d 100644
--- a/vanitygen.c
+++ b/vanitygen.c
@@ -31,7 +31,7 @@
 
 #include "pattern.h"
 
-const char *version = "0.15";
+const char *version = "0.16";
 
 typedef struct _vg_thread_context_s {
 	vg_exec_context_t		base;