summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2016-01-17 22:24:04 +0000
committerJose Fonseca <jfonseca@vmware.com>2016-01-17 22:24:04 +0000
commit9eb1475f0ec4b6512cf43206845b504d61c989b2 (patch)
tree607130ee625ef7814e3e2c5fcf0b1cc2c231e495 /docs
parent06e20a68bd06ef3f72f9f58165d1d55042816a91 (diff)
docs: A few further tweaks/corrections to the install docs.
Diffstat (limited to 'docs')
-rw-r--r--docs/INSTALL.markdown25
1 files changed, 14 insertions, 11 deletions
diff --git a/docs/INSTALL.markdown b/docs/INSTALL.markdown
index 90cd1539..87255da1 100644
--- a/docs/INSTALL.markdown
+++ b/docs/INSTALL.markdown
@@ -151,14 +151,6 @@ need to [use absolute paths](https://github.com/apitrace/apitrace/issues/352).
After you've successfully configured, you can start the build by opening the
generated `build\apitrace.sln` solution file
-The steps to build 64-bits version are similar, but choosing _Visual Studio xx
-Win64_ instead of _Visual Studio xx_.
-
-By default, binaries generated by recent builds of Visual Studio will not work
-on Windows XP. If you want to obtain binaries that work on Windows XP then pass the
-`-T v110_xp` or `-T v120_xp` options to cmake when building with Visual Studio
-2012 or 2013 respectively.
-
### CMake CLI ###
Another option is to use the commandline to configure the project. First of all find out which
@@ -168,9 +160,8 @@ generators are available on your system:
At the end of the output, choose a generator and start configuring the project:
- cmake -H. -Bbuild -DCMAKE_PREFIX_PATH=C:\Qt\QtX.Y.Z\X.Y\msvc2013_64 -G "Visual Studio 12 2013 Win64"
+ cmake -H. -Bbuild -DCMAKE_PREFIX_PATH=C:\Qt\QtX.Y.Z\X.Y\msvc2013 -G "Visual Studio 12 2013"
-For 32-bit builds remove the `Win64` and the `_64` from the command.
After you've successfully configured, you can start the build by invoking CMake as:
cmake --build build --config MinSizeRel
@@ -184,11 +175,23 @@ to copy all necessary DLLs, like:
set Path=C:\Qt\QtX.Y.Z\X.Y\msvc2013\bin;%Path%
windeployqt build\qapitrace.exe
+### 64-bits ###
+
+The steps to build 64-bits version are similar, but choosing _Visual Studio xx
+Win64_ instead of _Visual Studio xx_, and using `C:\Qt\QtX.Y.Z\X.Y\msvc2013_64`
+for Qt path.
+
+### Windows XP ###
+
+By default, binaries generated by recent builds of Visual Studio will not work
+on Windows XP. If you want to obtain binaries that work on Windows XP then
+pass the `-T v120_xp` options to CMake when building with Visual Studio 2013.
+
## MinGW ##
Additional requirements:
-* [MinGW-w64](http://mingw-w64.sourceforge.net/) (tested with mingw-w64's gcc version 4.6.3)
+* [MinGW-w64](http://mingw-w64.sourceforge.net/) (tested with mingw-w64's gcc version 4.9)
* [DirectX headers](https://github.com/apitrace/dxsdk)