Peter M. Groen / openbr

Commit 1c4babd02c328c7918fb14bf4014297c190e8f3d

Authored by Josh Klontz
1 parent fb845def

visual studio updated build instructions mostly complete

Inline Side-by-side
Showing 1 changed file with 13 additions and 26 deletions
openbr/openbr_export.cpp
  View file @1c4babd
@@ -87,17 +87,17 @@ $ br -help @@ -87,17 +87,17 @@ $ br -help
87 * -# You will have to register with Microsoft after installation, but it's free. 87 * -# You will have to register with Microsoft after installation, but it's free.
88 * -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>. 88 * -# Grab any available <a href="http://www.microsoft.com/visualstudio/eng/downloads#d-visual-studio-2012-update">Visual Studio Updates</a>.
89 * -# Download and install <a href="http://msdn.microsoft.com/en-us/windows/hardware/hh852363.aspx">Windows 8 SDK</a>. 89 * -# Download and install <a href="http://msdn.microsoft.com/en-us/windows/hardware/hh852363.aspx">Windows 8 SDK</a>.
90 - * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download CMake 2.8.10.2</a> and install. 90 + * -# <a href="http://www.cmake.org/files/v2.8/cmake-2.8.10.2-win32-x86.exe">Download and Install CMake 2.8.10.2</a>
91 * -# During installation setup select "add CMake to PATH". 91 * -# During installation setup select "add CMake to PATH".
92 - * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.4/OpenCV-2.4.4.tar.bz2">Download OpenCV 2.4.4</a>. 92 + * -# <a href="http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.5/opencv-2.4.5.tar.gz">Download OpenCV 2.4.5</a>.
93 * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs. 93 * -# Consider the free open source program <a href="http://www.7-zip.org/">7-Zip</a> if you need a program to unarchive tarballs.
94 - * -# Move the "OpenCV-2.4.4" folder to "C:\". 94 + * -# Move the "opencv-2.4.5" folder to "C:\".
95 * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter: 95 * -# Open "VS2012 x64 Cross Tools Command Prompt" (from the Start Menu, select "All Programs" -> "Microsoft Visual Studio 2012" -> "Visual Studio Tools" -> "VS2012 x64 Cross Tools Command Prompt") and enter:
96 * \code 96 * \code
97 - * $ cd C:\OpenCV-2.4.4 97 + * $ cd C:\opencv-2.4.5
98 * $ mkdir build-msvc2012 98 * $ mkdir build-msvc2012
99 * $ cd build-msvc2012 99 * $ cd build-msvc2012
100 - * $ cmake -G "NMake Makefiles" -DBUILD_opencv_java=OFF -DBUILD_opencv_world=ON -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DWITH_FFMPEG=OFF -DCMAKE_BUILD_TYPE=Debug .. 100 + * $ cmake -G "NMake Makefiles" -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DWITH_FFMPEG=OFF -DCMAKE_BUILD_TYPE=Debug ..
101 * $ nmake 101 * $ nmake
102 * $ nmake install 102 * $ nmake install
103 * $ cmake -DCMAKE_BUILD_TYPE=Release .. 103 * $ cmake -DCMAKE_BUILD_TYPE=Release ..
@@ -105,19 +105,7 @@ $ br -help @@ -105,19 +105,7 @@ $ br -help
105 * $ nmake install 105 * $ nmake install
106 * $ nmake clean 106 * $ nmake clean
107 * \endcode 107 * \endcode
108 - * -# <a href="http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.zip">Download Qt 5.0.1</a> and unzip.  
109 - * -# Install Perl/Python/Ruby dependencies as explained in the "Windows" section of "README". Make sure they are added to "path" when given the option during installation.  
110 - * -# <a href="http://www.microsoft.com/en-us/download/confirmation.aspx?id=6812">Download Direct X Software Developement Kit</a> and install.  
111 - * -# From the VS2012 x64 Cross Tools Command Prompt:  
112 - * \code  
113 - * $ cd qt-everywhere-opensource-src-5.0.1  
114 - * $ configure -prefix C:\Qt\5.0.1\msvc2012 -opensource -confirm-license -nomake examples -nomake tests  
115 - * $ nmake  
116 - * $ nmake install  
117 - * $ cd ..  
118 - * $ rmdir /Q /S qt-everywhere-opensource-src-5.0.1  
119 - * \endcode  
120 - * -# nmake will take several hours to finish. 108 + * -# <a href="http://download.qt-project.org/official_releases/qt/5.0/5.0.2/qt-windows-opensource-5.0.2-msvc2012_64-x64-offline.exe">Download and Install Qt 5.0.2</a>
121 * -# Create a <a href="github.com">GitHub</a> account and follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>. 109 * -# Create a <a href="github.com">GitHub</a> account and follow their instructions for <a href="https://help.github.com/articles/set-up-git">setting up Git</a>.
122 * -# Launch "Git Bash" from the Desktop and clone OpenBR: 110 * -# Launch "Git Bash" from the Desktop and clone OpenBR:
123 * \code 111 * \code
@@ -133,31 +121,30 @@ $ br -help @@ -133,31 +121,30 @@ $ br -help
133 * $ cd C:\openbr 121 * $ cd C:\openbr
134 * $ mkdir build-msvc2012 122 * $ mkdir build-msvc2012
135 * $ cd build-msvc2012 123 * $ cd build-msvc2012
136 - * $ cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-msvc2012/install;C:/Qt/5.0.1/msvc2012" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release .. 124 + * $ cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_PREFIX_PATH="C:/openCV-2.4.5/build-msvc2012/install;C:/Qt/Qt5.0.2/5.0.2/msvc2012_64" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release ..
137 * $ nmake 125 * $ nmake
138 * $ nmake install 126 * $ nmake install
139 * \endcode 127 * \endcode
140 * -# Check out the "install" folder. 128 * -# Check out the "install" folder.
141 * -# Hack OpenBR! 129 * -# Hack OpenBR!
142 - * -# <a href="http://releases.qt-project.org/qtcreator/2.6.2/qt-creator-windows-opensource-2.6.2.exe">Download Qt Creator</a> IDE and install.  
143 * -# From the VS2012 x64 Cross Tools Command Prompt: 130 * -# From the VS2012 x64 Cross Tools Command Prompt:
144 * \code 131 * \code
145 - * $ C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe 132 + * $ C:\Qt\Qt5.0.2\Tools\QtCreator\bin\qtcreator.exe
146 * \endcode 133 * \endcode
147 * -# From the Qt Creator "Tools" menu select "Options..." 134 * -# From the Qt Creator "Tools" menu select "Options..."
148 * -# Under "Kits" select "Desktop (default)" 135 * -# Under "Kits" select "Desktop (default)"
149 - * -# For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (amd64)" and click "OK" 136 + * -# For "Compiler:" select "Microsoft Visual C++ Compiler 11.0 (x86_amd64)" and click "OK"
150 * -# From the Qt Creator "File" menu select "Open File or Project...". 137 * -# From the Qt Creator "File" menu select "Open File or Project...".
151 * -# Select "C:\openbr\CMakeLists.txt" then "Open". 138 * -# Select "C:\openbr\CMakeLists.txt" then "Open".
  139 + * -# If prompted for the location of CMake, enter "C:\Program Files (x86)\CMake 2.8\bin\cmake.exe".
152 * -# Browse to your pre-existing build directory "C:\openbr\build-msvc2012" then select "Next". 140 * -# Browse to your pre-existing build directory "C:\openbr\build-msvc2012" then select "Next".
153 - * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish".  
154 - * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator-2.6/">here</a> if you need. 141 + * -# Select "Run CMake" then "Finish".
  142 + * -# You're all set! You can find more information on Qt Creator <a href="http://qt-project.org/doc/qtcreator">here</a> if you need.
155 * -# (Optional) Package OpenBR! 143 * -# (Optional) Package OpenBR!
156 - * -# <a href="http://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download?use_mirror=iweb&download=">Download NSIS 2.46</a> and install.  
157 * -# From the VS2012 x64 Cross Tools Command Prompt: 144 * -# From the VS2012 x64 Cross Tools Command Prompt:
158 * \code 145 * \code
159 * $ cd C:\openbr\build-msvc2012 146 * $ cd C:\openbr\build-msvc2012
160 - * $ nmake package 147 + * $ cpack -G ZIP
161 * \endcode 148 * \endcode
162 */ 149 */
163 150