summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2016-04-08 17:37:30 +0100
committerJose Fonseca <jfonseca@vmware.com>2016-04-08 17:37:30 +0100
commitd335cfb12b514c22dfd3a128bf3da26900d2eccf (patch)
treedfca7c1b4db4d5669532b08780892f6e1fe952d4 /docs
parent43ee8c7aa7e8951e8db3110b2dfbd2a31494d85a (diff)
docs,cmake: Update build instructions for MSVC 2015.
MSVC 2013 is still supported. But I hope to make MSVC 2015 a requirement in the near future.
Diffstat (limited to 'docs')
-rw-r--r--docs/INSTALL.markdown21
1 files changed, 12 insertions, 9 deletions
diff --git a/docs/INSTALL.markdown b/docs/INSTALL.markdown
index 2e75f153..a290c63a 100644
--- a/docs/INSTALL.markdown
+++ b/docs/INSTALL.markdown
@@ -134,7 +134,9 @@ build process. It expects a linaro-type of Android NDK to be present in
Additional requirements:
-* Microsoft Visual Studio 2013 or newer (tested with 2013)
+* CMake 3.4 or later
+
+* Microsoft Visual Studio 2013 or newer (instructions presume 2015)
* [Windows 10 SDK](https://dev.windows.com/en-us/downloads/windows-10-sdk)
for D3D11.3 headers.
@@ -142,13 +144,13 @@ Additional requirements:
* Microsoft DirectX SDK is now part of Microsoft Visual Studio (from version
2012), but D3D8 headers are not included, so if you want D3D8 support you'll
need to donwload and install the
- [August 2007 release of DirectX SDK](http://www.microsoft.com/downloads/details.aspx?familyid=529F03BE-1339-48C4-BD5A-8506E5ACF571)
+ [August 2007 release of DirectX SDK](https://www.microsoft.com/en-gb/download/details.aspx?id=13287)
### CMake GUI ###
To build with Visual Studio first invoke CMake GUI as:
- cmake-gui -H. -Bbuild -DCMAKE_PREFIX_PATH=C:\Qt\QtX.Y.Z\X.Y\msvc2013
+ cmake-gui -H. -Bbuild -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_PREFIX_PATH=C:\Qt\QtX.Y.Z\X.Y\msvc2015
and press the _Configure_ button.
@@ -171,32 +173,33 @@ 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 -G "Visual Studio 12 2013"
+ cmake -H. -Bbuild -G "Visual Studio 14 2015" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_PREFIX_PATH=C:\Qt\QtX.Y.Z\X.Y\msvc2015
After you've successfully configured, you can start the build by invoking CMake as:
- cmake --build build --config MinSizeRel
+ cmake --build build --config RelWithDebInfo
### Deployment ###
-To run qapitrace, either ensure that `C:\Qt\QtX.Y.Z\X.Y\msvc2013\bin` is in the system path, or use
+To run qapitrace, either ensure that `C:\Qt\QtX.Y.Z\X.Y\msvc2015\bin` is in the system path, or use
[Qt's Windows deployment tool](http://doc.qt.io/qt-5/windows-deployment.html#the-windows-deployment-tool)
to copy all necessary DLLs, like:
- set Path=C:\Qt\QtX.Y.Z\X.Y\msvc2013\bin;%Path%
+ set Path=C:\Qt\QtX.Y.Z\X.Y\msvc2015\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`
+Win64_ instead of _Visual Studio xx_, and using `C:\Qt\QtX.Y.Z\X.Y\msvc2015_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.
+pass the `-T v140_xp -DCMAKE_SYSTEM_VERSION=5.1` options to CMake when building
+with Visual Studio 2015.
## MinGW ##