From df9921a8fbea8a9c2a5ba951c08d39d35487caa2 Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 9 Mar 2016 19:55:24 -0800 Subject: [PATCH 1/3] Update BuildGuideQtCreator.md --- Data/BuildGuideQtCreator.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 34e494a..1c47e4f 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -86,13 +86,13 @@ This will download and build `glm libpng libxml zlib`. You will have a folder st ###Begin build with Qt Creator Open the Qt Project `fractorium/main.pro` using Qt Creator with the default config of *Desktop Qt [version] MSVC2013 64bit*. -Select *Shadow build* in *Edit build configuration* for both *Debug* and *Release*. +Make sure *Shadow build* in *Edit build configuration* for both *Debug* and *Release* is unchecked. Switch to the *Release* configuration. Under *Build Steps*, add an additional argument of `install` to the `make` command to force all dependencies to be copied to the output folder. The final make command should look like: -`jom.exe install in /path/to/your/build/build-main-Desktop_Qt_5_5_1_MSVC2013_64bit-Release` +`jom.exe install in /path/to/fractorium` Ensure all projects are in the *Release* configuration and build main.pro. From f6831ea8325b3bde62084620db175211d0a8cfbe Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 9 Mar 2016 19:58:00 -0800 Subject: [PATCH 2/3] Update BuildGuideQtCreator.md --- Data/BuildGuideQtCreator.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 1c47e4f..284c35c 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -134,13 +134,13 @@ The output contents will be: ``` dark.qss -Ember.dll -Ember.exp -Ember.lib +ember.dll +ember.exp +ember.lib emberanimate.exe -EmberCL.dll -EmberCL.exp -EmberCL.lib +emberCL.dll +emberCL.exp +emberCL.lib embergenome.exe emberrender.exe flam3-palettes.xml @@ -171,9 +171,9 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2013 ( [YOUR FOLDER] │ ├─ dark.qss -├─ Ember.dll +├─ ember.dll ├─ emberanimate.exe -├─ EmberCL.dll +├─ emberCL.dll ├─ embergenome.exe ├─ emberrender.exe ├─ flam3-palettes.xml From c2c293a37359fa5a467f7f3922738e147be29311 Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 9 Mar 2016 19:58:41 -0800 Subject: [PATCH 3/3] Update BuildGuideQtCreator.md --- Data/BuildGuideQtCreator.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 284c35c..9c963bd 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -138,9 +138,9 @@ ember.dll ember.exp ember.lib emberanimate.exe -emberCL.dll -emberCL.exp -emberCL.lib +embercl.dll +embercl.exp +embercl.lib embergenome.exe emberrender.exe flam3-palettes.xml @@ -173,7 +173,7 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2013 ( ├─ dark.qss ├─ ember.dll ├─ emberanimate.exe -├─ emberCL.dll +├─ embercl.dll ├─ embergenome.exe ├─ emberrender.exe ├─ flam3-palettes.xml