Peter M. Groen / openbr

Commit a5e72ecc1d43be294306b299b58c556d97d6ca2b

Authored by Scott Klum
1 parent 41d11343

Tweaked windows install docs

Inline Side-by-side
Showing 1 changed file with 6 additions and 7 deletions
docs/docs/install.md
  View file @a5e72ec
@@ -155,14 +155,13 @@ Need to remake this step with the new docs! @@ -155,14 +155,13 @@ Need to remake this step with the new docs!
155 155
156 # Windows 156 # Windows
157 157
158 -1. [Download Visual Studio Express 2013 for Windows Desktop](http://go.microsoft.com/?linkid=9832280&clcid=0x409) and install. 158 +1. [Download Visual Studio Express 2013 for Windows Desktop](http://go.microsoft.com/?linkid=9832280&clcid=0x409) and install. You will have to register with Microsoft, but it's free.
159 1. Consider the free open source program [WinCDEmu](http://wincdemu.sysprogs.org) if you need a program to mount ISO images. 159 1. Consider the free open source program [WinCDEmu](http://wincdemu.sysprogs.org) if you need a program to mount ISO images.
160 - 2. You will have to register with Microsoft after installation, but it's free.  
161 - 3. Grab any available [Visual Studio Updates](http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update).  
162 - 4. Download and install [Windows 8 SDK](http://msdn.microsoft.com/en-us/windows/hardware/hh852363.aspx). 160 + 2. Grab any available [Visual Studio Updates](http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update).
  161 + 3. Download and install [Windows 8 SDK](http://msdn.microsoft.com/en-us/windows/hardware/hh852363.aspx).
163 162
164 2. [Download and Install CMake 3.0.2](http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe) 163 2. [Download and Install CMake 3.0.2](http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe)
165 - 1. During installation setup select "add CMake to PATH". 164 + 1. During installation setup select "Add CMake to PATH".
166 165
167 3. [Download OpenCV 2.4.11](http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.11/opencv-2.4.11.zip/download) 166 3. [Download OpenCV 2.4.11](http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.11/opencv-2.4.11.zip/download)
168 1. Consider the free open source program [7-Zip](http://www.7-zip.org/) if you need a program to unarchive tarballs. 167 1. Consider the free open source program [7-Zip](http://www.7-zip.org/) if you need a program to unarchive tarballs.
@@ -198,7 +197,7 @@ Need to remake this step with the new docs! @@ -198,7 +197,7 @@ Need to remake this step with the new docs!
198 $ cd C:\openbr 197 $ cd C:\openbr
199 $ mkdir build-msvc2013 198 $ mkdir build-msvc2013
200 $ cd build-msvc2013 199 $ cd build-msvc2013
201 - $ cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_PREFIX_PATH="C:/opencv-2.4.11/build-msvc2013/install;C:/Qt/5.4.1/msvc2013_64" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release .. 200 + $ cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_PREFIX_PATH="C:/opencv-2.4.11/build/install;C:/Qt/Qt5.4.1/5.4/msvc2013_64" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release ..
202 $ nmake 201 $ nmake
203 $ nmake install 202 $ nmake install
204 203
@@ -206,7 +205,7 @@ Need to remake this step with the new docs! @@ -206,7 +205,7 @@ Need to remake this step with the new docs!
206 205
207 7. Hack OpenBR! 206 7. Hack OpenBR!
208 1. From the VS2013 x64 Cross Tools Command Prompt: 207 1. From the VS2013 x64 Cross Tools Command Prompt:
209 - $ C:\Qt\5.4.1\Tools\QtCreator\bin\qtcreator.exe 208 + $ C:\Qt\Qt5.4.1\Tools\QtCreator\bin\qtcreator.exe
210 2. From the Qt Creator "Tools" menu select "Options..." 209 2. From the Qt Creator "Tools" menu select "Options..."
211 3. Under "Kits" select "Desktop (default)" 210 3. Under "Kits" select "Desktop (default)"
212 4. For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (x86_amd64)" and click "OK" 211 4. For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (x86_amd64)" and click "OK"