diff --git a/openbr/openbr_export.cpp b/openbr/openbr_export.cpp index dd6fe86..5d3c121 100644 --- a/openbr/openbr_export.cpp +++ b/openbr/openbr_export.cpp @@ -90,7 +90,7 @@ $ br -help * -# Download and install Windows 8 SDK. * -# Download and Install CMake 2.8.10.2 * -# During installation setup select "add CMake to PATH". - * -# Download OpenCV 2.4.5. + * -# Download OpenCV 2.4.5 * -# Consider the free open source program 7-Zip if you need a program to unarchive tarballs. * -# Move the "opencv-2.4.5" folder to "C:\". * -# 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: @@ -151,20 +151,20 @@ $ br -help /*! * \page windows_mingw Windows 7 - MinGW-w64 2.0 - x64 - * -# Download MinGW-w64 GCC 4.7.2 and unarchive. + * -# Download and Unarchive MinGW-w64 GCC 4.7.2 * -# Use the free open source program 7-Zip to unarchive. * -# Move "x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb\mingw64" to "C:\". - * -# Download CMake 2.8.10.2 and install. + * -# Download and Install CMake 2.8.10.2 * -# During installation setup select "add CMake to PATH". - * -# Download OpenCV 2.4.4. + * -# Download OpenCV 2.4.5 * -# Consider the free open source program 7-Zip if you need a program to unarchive tarballs. - * -# Move the "OpenCV-2.4.4" folder to "C:\". + * -# Move the "opencv-2.4.5" folder to "C:\". * -# From the MinGW-w64 Command Prompt (double-click "C:\mingw64\mingw64env.cmd"): * \code - * $ cd C:\OpenCV-2.4.4 + * $ cd C:\opencv-2.4.5 * $ mkdir build-mingw64 * $ cd build-mingw64 - * $ cmake -G "MinGW Makefiles" -DBUILD_opencv_java=OFF -DBUILD_opencv_world=ON -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DWITH_FFMPEG=OFF -DCMAKE_BUILD_TYPE=Debug .. + * $ cmake -G "MinGW Makefiles" -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DWITH_FFMPEG=OFF -DCMAKE_BUILD_TYPE=Debug .. * $ mingw32-make * $ mingw32-make install * $ cmake -DCMAKE_BUILD_TYPE=Release .. @@ -172,17 +172,17 @@ $ br -help * $ mingw32-make install * $ mingw32-make clean * \endcode - * -# Download Qt 5.0.1 and unzip. + * -# Download and Unzip Qt 5.0.2. * -# 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. * -# Download Direct X Software Developement Kit and install. You may also need to install the latest OpenGL drivers from your graphics card manufacturer. * -# From the MinGW-w64 Command Prompt: * \code - * $ cd qt-everywhere-opensource-src-5.0.1 - * $ configure -prefix C:\Qt\5.0.1\mingw64 -opensource -confirm-license -nomake examples -nomake tests -opengl desktop + * $ cd qt-everywhere-opensource-src-5.0.2 + * $ configure -prefix C:\Qt\Qt5.0.2\5.0.2\mingw64 -opensource -confirm-license -nomake examples -nomake tests -opengl desktop * $ mingw32-make * $ mingw32-make install * $ cd .. - * $ rmdir /Q /S qt-everywhere-opensource-src-5.0.1 + * $ rmdir /Q /S qt-everywhere-opensource-src-5.0.2 * \endcode * -# mingw32-make will take several hours to finish. * -# Create a GitHub account and follow their instructions for setting up Git. @@ -200,31 +200,30 @@ $ br -help * $ cd C:\openbr * $ mkdir build-mingw64 * $ cd build-mingw64 - * $ cmake -G "CodeBlocks - MinGW Makefiles" -DCMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -DCMAKE_PREFIX_PATH="C:/OpenCV-2.4.4/build-mingw64/install;C:/Qt/5.0.1/mingw64" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release .. + * $ cmake -G "CodeBlocks - MinGW Makefiles" -DCMAKE_RC_COMPILER="C:/mingw64/bin/windres.exe" -DCMAKE_PREFIX_PATH="C:/opencv-2.4.5/build-mingw64/install;C:/Qt/Qt5.0.2/5.0.2/mingw64" -DCMAKE_INSTALL_PREFIX="./install" -DBR_INSTALL_DEPENDENCIES=ON -DCMAKE_BUILD_TYPE=Release .. * $ mingw32-make * $ mingw32-make install * \endcode * -# Check out the "install" folder. * -# Hack OpenBR! - * -# Download Qt Creator IDE and install. * -# From the MinGW-w64 Command Prompt: * \code - * $ "C:\Qt\qtcreator-2.6.2\bin\qtcreator.exe" + * $ C:\Qt\Qt5.0.2\Tools\QtCreator\bin\qtcreator.exe * \endcode * -# From the Qt Creator "Tools" menu select "Options..." * -# Under "Kits" select "Desktop (default)" - * -# For "Compiler:" select "MinGW (x86 64bit)" and click "OK" + * -# For "Compiler:" select "MinGW (x86 64bit in C:\mingw64\bin)" and click "OK" * -# From the Qt Creator "File" menu select "Open File or Project...". * -# Select "C:\openbr\CMakeLists.txt" then "Open". + * -# If prompted for the location of CMake, enter "C:\Program Files (x86)\CMake 2.8\bin\cmake.exe". * -# Browse to your pre-existing build directory "C:\openbr\build-mingw64" then select "Next". * -# Clear any text in the "arguments" box then select "Run CMake" then "Finish". - * -# You're all set! You can find more information on Qt Creator here if you need. + * -# You're all set! You can find more information on Qt Creator here if you need. * -# (Optional) Package OpenBR! - * -# Download NSIS 2.46 and install. * -# From the MinGW-w64 Command Prompt: * \code * $ cd C:\openbr\build-mingw64 - * $ mingw32-make package + * $ cpack -G ZIP * \endcode */ @@ -396,7 +395,7 @@ $ br -help * \page qmake_integration QMake Integration * \brief Add OpenBR to your Qt .pro project. * - * After completing the \ref installation instructions, try launching Qt Creator and opening /share/openbr/qmake_tutorial/hello.pro. + * After completing the \ref installation instructions, try launching Qt Creator and opening \/share/openbr/qmake_tutorial/hello.pro. * * Happy hacking! */