From 97acc02b078bf0c3672a0574925bfcb58b9dd490 Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Fri, 22 Dec 2017 04:18:11 +0000 Subject: [PATCH 1/4] README.md edited online with Bitbucket --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3353ebf..a57ef04 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ All builds are 64-bit. ## Windows -[Build Guide for Visual Studio 2015 or Qt Creator](Data/BuildGuideQtCreator.md) +[Build Guide for Visual Studio 2017 or Qt Creator](Data/BuildGuideQtCreator.md) ## Linux From 420fa2e376e8916d6502767574c6ec33ff6eed8a Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Fri, 22 Dec 2017 04:19:13 +0000 Subject: [PATCH 2/4] BuildGuideQtCreator.md edited online with Bitbucket --- Data/BuildGuideQtCreator.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 07eb9c2..3504ddf 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -7,11 +7,11 @@ Install [git](https://git-scm.com/downloads). ###Visual Studio -Install [Microsoft Visual Studio 2015 or later](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx), then install the latest updates. +Install [Microsoft Visual Studio 2017 or later](https://www.visualstudio.com/downloads/), then install the latest updates. ###Qt -Install Qt for Windows 64-bit (VS 2015) 5.8 or later (http://www.qt.io/download/). +Install Qt for Windows 64-bit (VS 2017) 5.8 or later (http://www.qt.io/download/). Add system environment variable named `QTPATH` and point it to the location of the Qt folder. On a default install, this will be something like: From ca13636cb4ebf9f77df4599c2ec5e52cbdf8bdfc Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Fri, 22 Dec 2017 04:23:07 +0000 Subject: [PATCH 3/4] BuildGuideQtCreator.md edited online with Bitbucket --- Data/BuildGuideQtCreator.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 3504ddf..74ad213 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -1,4 +1,4 @@ -#Build Guide For Visual Studio 2015 or Qt Creator +#Build Guide For Visual Studio 2017 or Qt Creator ##Tools ###git @@ -15,7 +15,7 @@ Install Qt for Windows 64-bit (VS 2017) 5.8 or later (http://www.qt.io/download/ Add system environment variable named `QTPATH` and point it to the location of the Qt folder. On a default install, this will be something like: -`C:\Qt\5.8\msvc2015_64` +`C:\Qt\5.8\msvc2017_64` ###Wix @@ -129,7 +129,7 @@ Run Visual Studio and verify there is a menu item named *Qt5*. Click on it and c Add a new Qt version to the list with the exact name of "Qt5", and set its path to the same as `$QTPATH`, which will be something like: -`C:\Qt\5.8\msvc2015_64` +`C:\Qt\5.9.1\msvc2017_64` The name "Qt5" must match exactly and this step must be completed before the Fractorium solution is opened. If not, the Qt add-in will completely ruin all solution and project files that use Qt. @@ -199,13 +199,13 @@ Double click fractorium.exe to run it, and use the command line to run the other To run on a computer without Visual Studio 2015, these files also need to be in the folder: ``` -MSVC2015\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.dll -MSVC2015\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.dll -MSVC2015\VC\redist\x64\Microsoft.VC140.CRT\vccorlib140.dll -MSVC2015\VC\redist\x64\Microsoft.VC140.CRT\concrt140.dll +MSVC2017\VC\Redist\MSVC\14.11.25325\x64\Microsoft.VC141.CRT\msvcp140.dll +MSVC2017\VC\Redist\MSVC\14.11.25325\x64\Microsoft.VC141.CRT\vcruntime140.dll +MSVC2017\VC\Redist\MSVC\14.11.25325\x64\Microsoft.VC141.CRT\vccorlib140.dll +MSVC2017\VC\Redist\MSVC\14.11.25325\x64\Microsoft.VC141.CRT\concrt140.dll ``` -or you can install [Visual C++ Redistributable Packages for Visual Studio 2015 (64 bit)](https://www.microsoft.com/en-us/download/details.aspx?id=53840) +or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 (64 bit)](https://www.visualstudio.com/downloads/) ##Final file structure for distribution From df4d8ff13b7c1b9b621d6a0968b15b413115a2d5 Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Fri, 22 Dec 2017 04:24:53 +0000 Subject: [PATCH 4/4] BuildGuideQtCreator.md edited online with Bitbucket --- Data/BuildGuideQtCreator.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 74ad213..49b553f 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -106,7 +106,7 @@ This will download and build `glm libopenexr libpng libxml zlib`. You will have ###Begin build with Qt Creator -Open the Qt Project `fractorium/main.pro` using Qt Creator with the default config of *Desktop Qt [version] MSVC2015 64bit*. +Open the Qt Project `fractorium/main.pro` using Qt Creator with the default config of *Desktop Qt [version] MSVC2017 64bit*. Make sure *Shadow build* in *Edit build configuration* for both *Debug* and *Release* is unchecked. Switch to the *Release* configuration. @@ -135,7 +135,7 @@ The name "Qt5" must match exactly and this step must be completed before the Fra Set the default version to the newly created Qt version and click *Ok*. -Open the file Fractorium.sln under Builds/MSVC/2015 +Open the file Fractorium.sln under Builds/MSVC/2017 Set the configuration to release, and build all. @@ -196,7 +196,7 @@ platforms\qwindows.dll Double click fractorium.exe to run it, and use the command line to run the others. -To run on a computer without Visual Studio 2015, these files also need to be in the folder: +To run on a computer without Visual Studio 2017, these files also need to be in the folder: ``` MSVC2017\VC\Redist\MSVC\14.11.25325\x64\Microsoft.VC141.CRT\msvcp140.dll