mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-10-31 09:20:23 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium

Browse Source
This commit is contained in:
Person
2017-12-21 21:13:21 -08:00
parent 57c0278d56 df4d8ff13b
commit 7956e008d7
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Data/BuildGuideQtCreator.md
View File

@ -1,4 +1,4 @@
#Build Guide For Visual Studio 2015 or Qt Creator
#Build Guide For Visual Studio 2017 or Qt Creator
##Tools
###git
@ -7,15 +7,15 @@ 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:
`C:\Qt\5.8\msvc2015_64`
`C:\Qt\5.8\msvc2017_64`
###Wix
@ -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.
@ -129,13 +129,13 @@ 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.
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,16 +196,16 @@ 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:
```
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

2
README.md
View File

@ -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