mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 05:00:06 -05:00
Merged mfeemster/fractorium into master
This commit is contained in:
Michel Mastriani
commit
b78918d81f
@ -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
|
||||
|
||||
@ -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.
|
||||
@ -130,13 +130,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.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.
|
||||
|
||||
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.
|
||||
|
||||
@ -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)
|
||||
│
|
||||
|
||||
12
README.md
12
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,16 +37,16 @@ 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
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
#include "EmberCommonPch.h"
|
||||
#include "EmberAnimate.h"
|
||||
#include "JpegUtils.h"
|
||||
#include <xmmintrin.h>
|
||||
#include <immintrin.h>
|
||||
#include <pmmintrin.h>
|
||||
|
||||
using namespace EmberCommon;
|
||||
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
#include "EmberCommonPch.h"
|
||||
|
||||
#include "EmberGenome.h"
|
||||
#include "JpegUtils.h"
|
||||
#include <xmmintrin.h>
|
||||
#include <immintrin.h>
|
||||
#include <pmmintrin.h>
|
||||
|
||||
using namespace EmberCommon;
|
||||
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
#include "EmberCommonPch.h"
|
||||
#include "EmberRender.h"
|
||||
#include "JpegUtils.h"
|
||||
#include <xmmintrin.h>
|
||||
#include <immintrin.h>
|
||||
#include <pmmintrin.h>
|
||||
|
||||
using namespace EmberCommon;
|
||||
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
#include "FractoriumPch.h"
|
||||
#include "Fractorium.h"
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <xmmintrin.h>
|
||||
#include <immintrin.h>
|
||||
#include <pmmintrin.h>
|
||||
|
||||
#ifdef __APPLE__
|
||||
/// <summary>
|
||||
|
||||
2
debian/control
vendored
2
debian/control
vendored
@ -2,7 +2,7 @@ Source: fractorium
|
||||
Section: graphics
|
||||
Priority: optional
|
||||
Maintainer: Matt Feemster <matt.feemster@gmail.com>
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user