Update windows-build.txt

windows-build.txt

@@ -72,6 +72,13 @@ struct tcp_keepalive
 (Start Icon/keyboard key ==> All Programs ==> MinGW ==> MinGW Shell).
 This will create your user directory for you.
 
+**************************************************************************************
+* OPTIONAL - Install YASM (only for if you intend to enable CPU mining)              *
+**************************************************************************************
+Open a browser to http://yasm.tortall.net/Download.html
+Download the Win32 or Win64 exe as appropriate
+Copy to c:\mingw\bin and rename to yasm.exe
+
 **************************************************************************************
 * Install libpdcurses                                                                *
 **************************************************************************************
@@ -81,12 +88,6 @@ mingw-get install mingw32-pdcurses
 Ctrl-D or typing "logout" and pressing the enter key should get you out of the
 window.
 
-**************************************************************************************
-* Copy BFGMiner source to your MSYS working directory                                *
-**************************************************************************************
-Copy BFGMiner source code directory into:
-\MinGW\msys\1.0\home\(folder with your user name)
-
 **************************************************************************************
 * Install GTK-WIN, required for Pkg-config in the next step                          *
 **************************************************************************************
@@ -131,88 +132,14 @@ Copy the jansson-X.X folder into your \MinGW\msys\1.0\home\
 Run the MinGW MSYS shell
 (Start Icon/keyboard key ==> All Programs ==> MinGW ==> MinGW Shell).
 Enter jansson-X.X dir, and type
-      ./configure
+      ./configure --prefix=/MinGW
       make
       make check
       make install
-Copy src/.libs/*.dll into \MinGW\bin
-Copy src/.libs/*.a, src/.libs/*.la, src/.libs/*.lai into \MinGW\lib
-Copy src/jansson.def into \MinGW\lib
-Copy src/*.h into \MinGW\include
-Create jansson.pc into \MinGW\lib\pkgconfig with this content:
-
-prefix=.
-exec_prefix=${prefix}/bin
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-Name: jansson
-Description: Library for encoding, decoding and manipulating JSON data
-Version: 2.4
-Libs: -L${libdir} -ljansson
-Cflags: -I${includedir} @CPPFLAG_JANSSON_STATICLIB@
 
 (Source: http://www.digip.org/jansson/doc/dev/gettingstarted.html)
 (Source: https://groups.google.com/forum/#!msg/jansson-users/CTPFBeZ0ZWQ/W3uuOuWZegkJ)
 
-**************************************************************************************
-* Build bfgminer.exe                                                                 *
-**************************************************************************************
-Run the MinGW MSYS shell
-(Start Icon/keyboard key ==> All Programs ==> MinGW ==> MinGW Shell).
-Change the working directory to your BFGMiner project folder.
-Example: cd bfgminer-2.7.1 [Enter Key] if you are unsure then type "ls -la"
-Another way is to type "cd bfg" and then press the tab key; It will auto fill.
-Type the lines below one at a time. Look for problems after each one before going on
-to the next.
-
-      adl.sh (optional - see below)
-      autoreconf -fvi
-      CFLAGS="-O2 -msse2" ./configure (additional config options, see below)
-      make
-      strip bfgminer.exe  <== only do this if you are not compiling for debugging
-
-**************************************************************************************
-* Copy files to a build directory/folder                                             *
-**************************************************************************************
-Make a directory and copy the following files into it. This will be your BFGMiner
-Folder that you use for mining. Remember the .cl filenames could change on later
-releases. If you installed a different version of libcurl then some of those dll's
-may be different as well.
-  bfgminer.exe      from \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x
-  *.cl              from \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x
-  README            from \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x
-  libblkmaker_jansson-0.1-0.dll from 
-                    \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x\libblkmaker\.libs
-  libblkmaker-0.1-0.dll from 
-                    \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x\libblkmaker\.libs
-  libcurl.dll       from \MinGW\bin
-  libidn-11.dll     from \MinGW\bin
-  libeay32.dll      from \MinGW\bin
-  ssleay32.dll      from \MinGW\bin
-  libpdcurses.dll   from \MinGW\bin
-  pthreadGC2.dll    from \MinGW\bin
-  libjansson-X.dll  from \MinGW\bin
-
-**************************************************************************************
-* Optional - Install Git into MinGW/MSYS                                             *
-**************************************************************************************
-Go to this url ==> http://code.google.com/p/msysgit/
-Click on the Downloads tab.
-Download the latest "Portable" git archive.
-Extract the git*.exe files from the bin folder and put them into \MinGW\bin.
-Extract the share\git-core folder and place it into \MinGW\share.
-After the previous step you should have a folder called \MinGW\share\git-core.
-To test if it is working, open a MinGW shell and type the following:
-  git config -–global core.autocrlf false (note: one time run only)
-  git clone git://github.com/luke-jr/bfgminer.git
-
-If you simply just want to update the source after you have already cloned, type:
-  git pull
-"git pull" did not work for me. Try the following which does the same thing:
-  git fetch && git merge FETCH_HEAD
-
-Now you can get the latest source directly from github.
-
 **************************************************************************************
 * Optional - Install libusb if you need auto USB device detection                    *
 * Required for Ztex and X6500                                                        *
@@ -258,7 +185,52 @@ Extract the the following from the file and place in where directed.
 Copy libusb.h from include\libusbx-1.0 to \MinGW\include\libusb-1.0\libusb.h
 Copy contents of MinGW32\static \MinGW\lib
 Copy contents of MinGW32\dll to \MinGW\lib
-You will have to copy "libusb-1.0.dll" to your working BFGMiner binary directory.
+
+NOTE: You will have to copy "libusb-1.0.dll" to your working BFGMiner binary directory.
+
+**************************************************************************************
+* REQUIRED - Install Git into MinGW/MSYS                                             *
+**************************************************************************************
+Go to this url ==> http://code.google.com/p/msysgit/downloads/list?q=full+installer+official+git
+Download and install the latest full installer
+In Windows Explorer, go to c:\MinGW\msys\1.0\home\<username>
+Create a text file named profile.txt with one of the following lines (leave off the win??> part)
+
+win86> PATH=$PATH:/c/Program\ Files/Git/bin
+win64> PATH=$PATH:/c/Program\ Files\ \(x86\)/Git/bin
+
+Save the file, open a MSYS Shell, and enter the following commands
+
+mv profile.txt .profile
+
+then close ALL MSYS Shell windows currently open
+
+Open a new MSYS Shell and enter the following commands
+
+  git clone git://github.com/luke-jr/bfgminer.git
+
+If you just want to update the source after you have already cloned, type:
+
+  cd bfgminer
+  git fetch
+
+Now you can get the latest source directly from github.
+
+**************************************************************************************
+* Build bfgminer.exe                                                                 *
+**************************************************************************************
+Run the MinGW MSYS shell
+(Start Icon/keyboard key ==> All Programs ==> MinGW ==> MinGW Shell).
+Change the working directory to your BFGMiner project folder.
+Example: cd bfgminer-2.7.1 [Enter Key] if you are unsure then type "ls -la"
+Another way is to type "cd bfg" and then press the tab key; It will auto fill.
+Type the lines below one at a time. Look for problems after each one before going on
+to the next.
+
+      ./autogen.sh
+      CFLAGS="-O2 -msse2" ./configure (additional config options, see below)
+      make
+      strip bfgminer.exe  <== only do this if you are not compiling for debugging
 
 **************************************************************************************
 * Some ./configure options                                                           *
@@ -275,6 +247,31 @@ You will have to copy "libusb-1.0.dll" to your working BFGMiner binary directory
 --without-curses        Compile support for curses TUI (default enabled)
 --without-libudev       Autodetect FPGAs using libudev (default enabled)
 
+**************************************************************************************
+* Copy files to a build directory/folder                                             *
+**************************************************************************************
+Make a directory and copy the following files into it. This will be your BFGMiner
+Folder that you use for mining. Remember the .cl filenames could change on later
+releases. If you installed a different version of libcurl then some of those dll's
+may be different as well.
+
+  bfgminer.exe	from \MinGW\msys\1.0\home\(username)\bfgminer
+  *.cl			from \MinGW\msys\1.0\home\(username)\bfgminer
+  README		from \MinGW\msys\1.0\home\(username)\bfgminer
+  libcurl.dll	from \MinGW\bin
+  libidn-11.dll	from \MinGW\bin
+  libeay32.dll	from \MinGW\bin
+  ssleay32.dll	from \MinGW\bin
+  libpdcurses.dll	from \MinGW\bin
+  pthreadGC2.dll	from \MinGW\bin
+  libjansson-X.dll	from \MinGW\msys\1.0\local\bin
+
+  libblkmaker_jansson-0.1-0.dll 
+	from \MinGW\msys\1.0\home\(username)\bfgminer\libblkmaker\.libs
+	
+  libblkmaker-0.1-0.dll 
+	from \MinGW\msys\1.0\home\(username)\bfgminer\libblkmaker\.libs
+
 ######################################################################################
 #                                                                                    #
 #       Native WIN32 setup and build instructions (on mingw32/Windows) complete      #