From d0c4fe547795369895e717bd33ca4f90cea46878 Mon Sep 17 00:00:00 2001 From: Claude Heiland-Allen Date: Wed, 8 Apr 2020 06:38:11 +0100 Subject: [PATCH 1/7] include intrinsics headers for _MM_ macros --- Source/EmberAnimate/EmberAnimate.cpp | 4 ++++ Source/EmberGenome/EmberGenome.cpp | 4 ++++ Source/EmberRender/EmberRender.cpp | 4 ++++ Source/Fractorium/Main.cpp | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/Source/EmberAnimate/EmberAnimate.cpp b/Source/EmberAnimate/EmberAnimate.cpp index 6395cc7..9c7535c 100644 --- a/Source/EmberAnimate/EmberAnimate.cpp +++ b/Source/EmberAnimate/EmberAnimate.cpp @@ -2,6 +2,10 @@ #include "EmberAnimate.h" #include "JpegUtils.h" +#include +#include +#include + using namespace EmberCommon; /// diff --git a/Source/EmberGenome/EmberGenome.cpp b/Source/EmberGenome/EmberGenome.cpp index 5008489..a43926b 100644 --- a/Source/EmberGenome/EmberGenome.cpp +++ b/Source/EmberGenome/EmberGenome.cpp @@ -3,6 +3,10 @@ #include "EmberGenome.h" #include "JpegUtils.h" +#include +#include +#include + using namespace EmberCommon; /// diff --git a/Source/EmberRender/EmberRender.cpp b/Source/EmberRender/EmberRender.cpp index 5efe75e..e727ac4 100644 --- a/Source/EmberRender/EmberRender.cpp +++ b/Source/EmberRender/EmberRender.cpp @@ -2,6 +2,10 @@ #include "EmberRender.h" #include "JpegUtils.h" +#include +#include +#include + using namespace EmberCommon; /// diff --git a/Source/Fractorium/Main.cpp b/Source/Fractorium/Main.cpp index 2042b4e..1048a94 100644 --- a/Source/Fractorium/Main.cpp +++ b/Source/Fractorium/Main.cpp @@ -2,6 +2,10 @@ #include "Fractorium.h" #include +#include +#include +#include + #ifdef __APPLE__ /// /// Export default user data to ./config/fractorium From 02e78d25554e9389f8cd413e6a7579126adc15f6 Mon Sep 17 00:00:00 2001 From: Claude Heiland-Allen Date: Sun, 12 Apr 2020 21:41:03 +0100 Subject: [PATCH 2/7] don't build-depend on libopenexr22 (libopenexr-dev is enough) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 672028a..2e8aba3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fractorium Section: graphics Priority: optional Maintainer: Matt Feemster -Build-Depends: debhelper (>= 9), g++ (>= 5.4), libc6-dev, libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers, qt5-default, qt5-qmake, qtbase5-dev, libopenexr22, libopenexr-dev +Build-Depends: debhelper (>= 9), g++ (>= 5.4), libc6-dev, libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers, qt5-default, qt5-qmake, qtbase5-dev, libopenexr-dev Standards-Version: 3.9.5 Homepage: http://fractorium.com/ Vcs-Git: https://bitbucket.org/mfeemster/fractorium From 12bef2a3cb56f64cd045739e77af3f4d21512eb4 Mon Sep 17 00:00:00 2001 From: Person Date: Sun, 12 Apr 2020 14:38:22 -0700 Subject: [PATCH 3/7] sync --- Source/EmberAnimate/EmberAnimate.cpp | 1 - Source/EmberGenome/EmberGenome.cpp | 2 -- Source/EmberRender/EmberRender.cpp | 1 - Source/Fractorium/Main.cpp | 1 - 4 files changed, 5 deletions(-) diff --git a/Source/EmberAnimate/EmberAnimate.cpp b/Source/EmberAnimate/EmberAnimate.cpp index 9c7535c..c2da6f3 100644 --- a/Source/EmberAnimate/EmberAnimate.cpp +++ b/Source/EmberAnimate/EmberAnimate.cpp @@ -1,7 +1,6 @@ #include "EmberCommonPch.h" #include "EmberAnimate.h" #include "JpegUtils.h" - #include #include #include diff --git a/Source/EmberGenome/EmberGenome.cpp b/Source/EmberGenome/EmberGenome.cpp index a43926b..972b3e7 100644 --- a/Source/EmberGenome/EmberGenome.cpp +++ b/Source/EmberGenome/EmberGenome.cpp @@ -1,8 +1,6 @@ #include "EmberCommonPch.h" - #include "EmberGenome.h" #include "JpegUtils.h" - #include #include #include diff --git a/Source/EmberRender/EmberRender.cpp b/Source/EmberRender/EmberRender.cpp index e727ac4..eff7086 100644 --- a/Source/EmberRender/EmberRender.cpp +++ b/Source/EmberRender/EmberRender.cpp @@ -1,7 +1,6 @@ #include "EmberCommonPch.h" #include "EmberRender.h" #include "JpegUtils.h" - #include #include #include diff --git a/Source/Fractorium/Main.cpp b/Source/Fractorium/Main.cpp index 1048a94..a90fbdc 100644 --- a/Source/Fractorium/Main.cpp +++ b/Source/Fractorium/Main.cpp @@ -1,7 +1,6 @@ #include "FractoriumPch.h" #include "Fractorium.h" #include - #include #include #include From a5e24498ea12cb96040957c53080c251859e90aa Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 15 Apr 2020 06:22:12 +0000 Subject: [PATCH 4/7] README.md edited online with Bitbucket --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 29d0de4..f888a1e 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,11 @@ of the cuburn algorithm in OpenCL. ## Windows -Download: [Fractorium_1.0.0.19.msi](https://drive.google.com/open?id=1GerFr8VRLFtfvV57acJawZg0bJVfhac-) +Download: [Fractorium_1.0.0.20.msi](https://drive.google.com/open?id=1IdYwa3msokLzdfng5deZ_Xg5hr-wOvk2) ## Mac -Download: [Fractorium_1.0.0.19.dmg](https://drive.google.com/open?id=1YH49dE858cUrPXl92jfclB00LDPQfBtY) +Download: [Fractorium_1.0.0.20.dmg](https://drive.google.com/open?id=1X_Ncbt2zfwbd3VgWwdHWe8xm6D2sVq2z) ## Linux @@ -37,7 +37,7 @@ sudo apt-get install fractorium Install ubuntu. -Download: [Fractorium-1.0.0.19.x86_64.deb](https://drive.google.com/open?id=1sYoLK27-w7RERxmh10GK4eTcwI2wuagO) +Download: [Fractorium-1.0.0.20.x86_64.deb](https://drive.google.com/open?id=1pdFNAn8CVkRqNbPXVA1LH_9LBoUCBAPv) ``` cd ~/Downloads @@ -46,7 +46,7 @@ sudo dpkg -i Fractorium-1.0.0.19.x86_64.deb ### Install from App Image .rpm -Download: [Fractorium-1.0.0.19.x86_64.rpm](https://drive.google.com/open?id=17zHmJghSM_hCjSNRXyf5PL6oWoy--Sq4) +Download: [Fractorium-1.0.0.20.x86_64.rpm](https://drive.google.com/open?id=1jdQvZ1scpZADGdBWn_LU6j3msgmGKrCY) # Building from git @@ -54,7 +54,7 @@ All builds are 64-bit. ## Windows -[Build Guide for Visual Studio 2017 or Qt Creator](Data/BuildGuideQtCreator.md) +[Build Guide for Visual Studio 2019 or Qt Creator](Data/BuildGuideQtCreator.md) ## Linux From 14cd471dd535aae07fbb2e3047867f2e16da79ba Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 15 Apr 2020 06:29:54 +0000 Subject: [PATCH 5/7] BuildGuideQtCreator.md edited online with Bitbucket --- Data/BuildGuideQtCreator.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Data/BuildGuideQtCreator.md b/Data/BuildGuideQtCreator.md index 799c796..15e6267 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -1,4 +1,4 @@ -#Build Guide For Visual Studio 2017 or Qt Creator +#Build Guide For Visual Studio 2019 or Qt Creator ##Tools ###git @@ -7,15 +7,15 @@ Install [git](https://git-scm.com/downloads). ###Visual Studio -Install [Microsoft Visual Studio 2017 or later](https://www.visualstudio.com/downloads/), then install the latest updates. +Install [Microsoft Visual Studio 2019 or later](https://www.visualstudio.com/downloads/), then install the latest updates. ###Qt -Install Qt for Windows 64-bit (VS 2017) 5.8 or later (http://www.qt.io/download/). +Install Qt for Windows 64-bit (VS 2017) 5.12.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\msvc2017_64` +`C:\Qt\5.12.8\msvc2017_64` ###Wix @@ -130,7 +130,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.9.1\msvc2017_64` +`C:\Qt\5.12.8\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. @@ -207,13 +207,14 @@ Double click fractorium.exe to run it, and use the command line to run the other 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 -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 +2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\msvcp140.dll +2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\vcruntime140.dll +2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\vcruntime140_1.dll +2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\vccorlib140.dll +2019\Community\VC\Redist\MSVC\14.25.28508\x64\Microsoft.VC142.CRT\concrt140.dll ``` -or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 (64 bit)](https://www.visualstudio.com/downloads/) +or you can install [Visual C++ Redistributable Packages for Visual Studio 2019 (64 bit)](https://www.visualstudio.com/downloads/) ##Final file structure for distribution @@ -262,6 +263,7 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 ( │ ├─ msvcp140.dll (optional) ├─ vcruntime140.dll (optional) + ├─ vcruntime140_1.dll (optional) ├─ vccorlib140.dll (optional) ├─ concrt140.dll (optional) │ From 596ae2992e8aea373bb8049640e717351886e89f Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 15 Apr 2020 06:31:50 +0000 Subject: [PATCH 6/7] 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 15e6267..0ecfac5 100644 --- a/Data/BuildGuideQtCreator.md +++ b/Data/BuildGuideQtCreator.md @@ -107,7 +107,7 @@ This will download and build `glm libopenexr libpng libxml tbb zlib`. You will h ###Begin build with Qt Creator -Open the Qt Project `fractorium/main.pro` using Qt Creator with the default config of *Desktop Qt [version] MSVC2017 64bit*. +Open the Qt Project `fractorium/main.pro` using Qt Creator with the default config of *Desktop Qt [version] MSVC2019 64bit*. Make sure *Shadow build* in *Edit build configuration* for both *Debug* and *Release* is unchecked. Switch to the *Release* configuration. @@ -136,7 +136,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/2017 +Open the file Fractorium.sln under Builds/MSVC/2019 Set the configuration to release, and build all. From d8bd073856915ac1d153cd7a8b5e2e1409b2c4de Mon Sep 17 00:00:00 2001 From: Matt Feemster Date: Wed, 15 Apr 2020 06:33:10 +0000 Subject: [PATCH 7/7] 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 f888a1e..700a939 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Download: [Fractorium-1.0.0.20.x86_64.deb](https://drive.google.com/open?id=1pdF ``` cd ~/Downloads -sudo dpkg -i Fractorium-1.0.0.19.x86_64.deb +sudo dpkg -i Fractorium-1.0.0.20.x86_64.deb ``` ### Install from App Image .rpm