Peter M. Groen / openbr

Commit 37313f6180b5ef77412900925f3cd76a4aa74702

Authored by Scott Klum
1 parent db93557c

Standardized versions Linux and OSX

Inline Side-by-side
Showing 1 changed file with 17 additions and 17 deletions
docs/docs/install.md
  View file @37313f6
@@ -4,30 +4,30 @@ A hacker's guide to building, editing, and running OpenBR. @@ -4,30 +4,30 @@ A hacker's guide to building, editing, and running OpenBR.
4 4
5 # Linux 5 # Linux
6 6
7 -1. Install GCC 4.7.3 7 +1. Install GCC 4.9.2
8 8
9 $ sudo apt-get update 9 $ sudo apt-get update
10 $ sudo apt-get install build-essential 10 $ sudo apt-get install build-essential
11 11
12 -2. Install CMake 2.8.10.1 12 +2. Install CMake 3.0.2
13 13
14 $ sudo apt-get install cmake cmake-curses-gui 14 $ sudo apt-get install cmake cmake-curses-gui
15 15
16 -3. [Download OpenCV 2.4.5](http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.5/opencv-2.4.5.tar.gz), **note** [Build OpenCV with video support](https://github.com/biometrics/openbr/wiki/Build-OpenCV-with-Video-Support-on-Ubuntu) 16 +3. [Download OpenCV 2.4.11](http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.11/opencv-2.4.11.zip/download), **note** [Build OpenCV with video support](https://github.com/biometrics/openbr/wiki/Build-OpenCV-with-Video-Support-on-Ubuntu)
17 17
18 $ cd ~/Downloads 18 $ cd ~/Downloads
19 - $ tar -xf opencv-2.4.5.tar.gz  
20 - $ cd opencv-2.4.5 19 + $ unzip opencv-2.4.11.zip
  20 + $ cd opencv-2.4.11
21 $ mkdir build 21 $ mkdir build
22 $ cd build 22 $ cd build
23 $ cmake -DCMAKE_BUILD_TYPE=Release .. 23 $ cmake -DCMAKE_BUILD_TYPE=Release ..
24 $ make -j4 24 $ make -j4
25 $ sudo make install 25 $ sudo make install
26 $ cd ../.. 26 $ cd ../..
27 - $ rm -rf opencv-2.4.5* 27 + $ rm -rf opencv-2.4.11*
28 28
29 29
30 -4. Install Qt 5.0.1 30 +4. Install Qt 5.4.1
31 31
32 $ sudo apt-get install qt5-default libqt5svg5-dev qtcreator 32 $ sudo apt-get install qt5-default libqt5svg5-dev qtcreator
33 33
@@ -78,9 +78,9 @@ Need to rewrite this step for the new docs! @@ -78,9 +78,9 @@ Need to rewrite this step for the new docs!
78 78
79 # OSX 79 # OSX
80 80
81 -1. Download and install the latest "Xcode" and "Command Line Tools" from the [Apple Developer Downloads](https://developer.apple.com/downloads/index.action#) page. 81 +1. Download and install the latest "XCode" and "Command Line Tools" from the [Apple Developer Downloads](https://developer.apple.com/downloads/index.action#) page.
82 82
83 -2. [Download CMake 2.8.11.2](http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz) 83 +2. [Download CMake 3.0.2](http://www.cmake.org/files/v3.0/cmake-3.0.2.tar.gz)
84 84
85 $ cd ~/Downloads 85 $ cd ~/Downloads
86 $ tar -xf cmake-2.8.11.2.tar.gz 86 $ tar -xf cmake-2.8.11.2.tar.gz
@@ -91,20 +91,20 @@ Need to rewrite this step for the new docs! @@ -91,20 +91,20 @@ Need to rewrite this step for the new docs!
91 $ cd .. 91 $ cd ..
92 $ rm -rf cmake-2.8.11.2* 92 $ rm -rf cmake-2.8.11.2*
93 93
94 -3. [Download OpenCV 2.4.6.1](http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.6.1/opencv-2.4.6.1.tar.gz) 94 +3. [Download OpenCV 2.4.11](http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.11/opencv-2.4.11.zip/download)
95 95
96 $ cd ~/Downloads 96 $ cd ~/Downloads
97 - $ tar -xf opencv-2.4.6.1.tar.gz  
98 - $ cd opencv-2.4.6.1 97 + $ unzip opencv-2.4.11.zip
  98 + $ cd opencv-2.4.11
99 $ mkdir build 99 $ mkdir build
100 $ cd build 100 $ cd build
101 $ cmake -DCMAKE_BUILD_TYPE=Release .. 101 $ cmake -DCMAKE_BUILD_TYPE=Release ..
102 $ make -j4 102 $ make -j4
103 $ sudo make install 103 $ sudo make install
104 $ cd ../.. 104 $ cd ../..
105 - $ rm -rf opencv-2.4.6.1* 105 + $ rm -rf opencv-2.4.11*
106 106
107 -4. [Download and install Qt 5.1.1](http://download.qt-project.org/official_releases/qt/5.1/5.1.1/qt-mac-opensource-5.1.1-clang-offline.dmg) 107 +4. [Download and install Qt 5.4.1](http://download.qt.io/official_releases/qt/5.4/5.4.1/qt-opensource-mac-x64-clang-5.4.1.dmg)
108 108
109 5. Create a [GitHub](https://github.com/) account, follow their instructions for [setting up Git](https://help.github.com/articles/set-up-git). 109 5. Create a [GitHub](https://github.com/) account, follow their instructions for [setting up Git](https://help.github.com/articles/set-up-git).
110 110
@@ -118,14 +118,14 @@ Need to rewrite this step for the new docs! @@ -118,14 +118,14 @@ Need to rewrite this step for the new docs!
118 118
119 $ mkdir build # from the OpenBR root directory 119 $ mkdir build # from the OpenBR root directory
120 $ cd build 120 $ cd build
121 - $ cmake -DCMAKE_PREFIX_PATH=~/Qt5.1.1/5.1.1/clang_64 -DCMAKE_BUILD_TYPE=Release .. 121 + $ cmake -DCMAKE_PREFIX_PATH=~/Qt/5.4.1/clang_64 -DCMAKE_BUILD_TYPE=Release ..
122 $ make -j4 122 $ make -j4
123 $ sudo make install 123 $ sudo make install
124 124
125 7. Hack OpenBR! 125 7. Hack OpenBR!
126 1. Open Qt Creator IDE 126 1. Open Qt Creator IDE
127 127
128 - $ open ~/Qt5.1.1/Qt\ Creator.app 128 + $ open ~/Qt/Qt\ Creator.app
129 129
130 2. From the Qt Creator "File" menu select "Open File or Project...". 130 2. From the Qt Creator "File" menu select "Open File or Project...".
131 3. Select "openbr/CMakeLists.txt" then "Open". 131 3. Select "openbr/CMakeLists.txt" then "Open".
@@ -155,7 +155,7 @@ Need to remake this step with the new docs! @@ -155,7 +155,7 @@ Need to remake this step with the new docs!
155 155
156 # Windows 156 # Windows
157 157
158 -1. [Download Visual Studio 2012 Express Edition for Windows Desktop](http://www.microsoft.com/en-us/download/details.aspx?id=34673) and install. 158 +1. [Download Visual Studio Express 2013 for Windows Desktop](http://go.microsoft.com/?linkid=9832280&clcid=0x409) and install.
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. 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). 161 3. Grab any available [Visual Studio Updates](http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update).