diff options
| author | Nick Nussbaum <nickn@seanet.com> | 2014-09-04 06:32:14 +0400 |
|---|---|---|
| committer | Nick Nussbaum <nickn@seanet.com> | 2014-09-04 06:32:14 +0400 |
| commit | 1a3bdb168f8b184eff9a61bb851feac27b7207df (patch) | |
| tree | 7ecb470e82a5045b647e3a1df57269f3402878ad /README.windows.txt | |
| parent | 890424d2bf30d25dc2cc2810b945f072619bc0d8 (diff) | |
Fix zlib patch for correct end of line for window in Visual Studio 2013
Update README.Winodows.txt to use GnuWin32 Patch Utility instead of github git patch
Diffstat (limited to 'README.windows.txt')
| -rw-r--r-- | README.windows.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/README.windows.txt b/README.windows.txt index c79224a3..bc21204f 100644 --- a/README.windows.txt +++ b/README.windows.txt @@ -146,7 +146,7 @@ ns)</PreprocessorDefinitions> ************************************************************************************************************** ************************************************************************************************************** Notes for building VW under Visual Studio 2013 on Windows 8.1 -8/16/2014 Nick Nussbaum nickn@seanet.com +9/02/2014 Nick Nussbaum nickn@seanet.com ************************************************************************************************************** @@ -160,10 +160,14 @@ There's a patch for zlib to make it work. There also some changes to Vowpal Wabbit in this commit. Details are at the last section of this file -It's handy to have a bash shell to run patch and git +It's handy to have a bash shell to run git You can use a git bash shell fron the https://windows.github.com/ if you don't have it already. Or you can just edit the changes using notepad to read the files. Git Patching seemed to have some problems with the files. +There are end of line problems with patching with git. +I used the GnuWin32 patch package hhttp://gnuwin32.sourceforge.net/packages/patch.htm which will run in a dos batch file. +This seems to be able to deal with patching without damaging the windows <CR><LF> pairs. + ************************************************************************************************************** (2) open a copy various command shells @@ -200,9 +204,11 @@ boost, vowpal_wabbit, and zlib-1.2.8 are directories inside that directory (b) unzip zlib-1.2.8.zip into the c:\src\vw\zlib-1.2.8 use contrib/vstudio/vc11 since there is no contrib/vstudio/vc12 as yet + get the GnuWin32 Patch Utility http://gnuwin32.sourceforge.net/packages/patch.htm patch.exe + and simply put it in vw. - - (c) from a bash shell cd /c/src/vw + (c) from a dos command shell + patch --dry-run -p0 --directory=zlib-1.2.8 --input=../vowpal_wabbit/zlibpatch.txt -F3 check output messages looks good then |