diff --git a/INSTALL b/INSTALL index 36a21dd..c256c19 100644 --- a/INSTALL +++ b/INSTALL @@ -12,14 +12,25 @@ Prerequisites: - 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. +Once you have set up these components, edit the following variables +in Makefile.Win32 to reflect the paths where these components were +installed: + +OPENSSL_DIR +PTHREADS_DIR +PCRE_DIR +OPENCL_DIR 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. +The default Makefile.Win32 includes CFLAGS required to link the static +versions of those libraries. If you want to link against DLLs, make +sure to change the CFLAGS. + +Additionally, to create a usable static build of the pthreads-Win32 +library, some other changes must be done. You must edit the Makefile, +and remove "/MD" from the CFLAGS. Then, build with: "nmake VC-static" -Then, open a Visual Studio command prompt window, and run: +After dependencies have been prepared, open a Visual Studio command +prompt window, and run: nmake /fMakefile.Win32 vanitygen.exe oclvanitygen.exe diff --git a/Makefile.Win32 b/Makefile.Win32 index a74ab95..f20f3f9 100644 --- a/Makefile.Win32 +++ b/Makefile.Win32 @@ -1,12 +1,12 @@ CC = cl OPENSSL_DIR = C:\OpenSSL-Win32 -PTHREADS_DIR = C:\pthreads-w32 +PTHREADS_DIR = C:\pthreads-w32-2-8-0-release PCRE_DIR = C:\pcre-7.9-src OPENCL_DIR = "C:\Program Files (x86)\AMD APP" OPENCL_INCLUDE = /I$(OPENCL_DIR)\include OPENCL_LIBS = $(OPENCL_DIR)\lib\x86\OpenCL.lib CFLAGS = /D_WIN32 /DPTW32_STATIC_LIB /DPCRE_STATIC /I$(OPENSSL_DIR)\include /I$(PTHREADS_DIR) /I$(PCRE_DIR) -LIBS = $(OPENSSL_DIR)\lib\libeay32.lib $(PTHREADS_DIR)\pthread.lib $(PCRE_DIR)\pcre.lib ws2_32.lib +LIBS = $(OPENSSL_DIR)\lib\libeay32.lib $(PTHREADS_DIR)\pthreadVC2.lib $(PCRE_DIR)\pcre.lib ws2_32.lib OBJS = vanitygen.obj oclvanitygen.obj pattern.obj winglue.obj all: vanitygen.exe