mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-02 02:50:06 -05: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 2019-05-13 15:46:43 -07:00
commit f05209093d
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Data/BuildGuideQtCreator.md
View File

@ -160,7 +160,8 @@ Apatite_Supergroup.ugr
boxtail_pack_02.gradient boxtail_pack_02.gradient
boxtail_pack_03_triangle.gradient boxtail_pack_03_triangle.gradient
boxtail_pack_04_mineshack.gradient boxtail_pack_04_mineshack.gradient
dark.qss dark_windows.qss
lightdark.qss
ember.dll ember.dll
ember.exp ember.exp
ember.lib ember.lib
@ -197,6 +198,7 @@ tatasz_pack_02_dark.gradient
tatasz_pack_02_warmer.gradient tatasz_pack_02_warmer.gradient
tatasz_pack_03.gradient tatasz_pack_03.gradient
tbb.dll tbb.dll
imageformats\qjpeg.dll
platforms\qwindows.dll platforms\qwindows.dll
``` ```
@ -223,7 +225,8 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 (
├─ boxtail_pack_02.gradient ├─ boxtail_pack_02.gradient
├─ boxtail_pack_03_triangle.gradient ├─ boxtail_pack_03_triangle.gradient
├─ boxtail_pack_04_mineshack.gradient ├─ boxtail_pack_04_mineshack.gradient
├─ dark.qss ├─ dark_windows.qss
├─ lightdark.qss
├─ ember.dll ├─ ember.dll
├─ emberanimate.exe ├─ emberanimate.exe
├─ embercl.dll ├─ embercl.dll
@ -262,6 +265,9 @@ or you can install [Visual C++ Redistributable Packages for Visual Studio 2017 (
├─ vccorlib140.dll (optional) ├─ vccorlib140.dll (optional)
├─ concrt140.dll (optional) ├─ concrt140.dll (optional)
│ │
└─imageformats
│
├─qjpeg.dll
└─platforms └─platforms
│ │
├─qwindows.dll ├─qwindows.dll

2
Data/control.package
View File

@ -1,7 +1,7 @@
Source: Fractorium Source: Fractorium
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Gambhiro Bhikkhu <matt.feemster@gmail.com> Maintainer: Matt Feemster <matt.feemster@gmail.com>
Build-Depends: debhelper (>= 9) Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: http://fractorium.com/ Homepage: http://fractorium.com/

2
debian/control vendored
View File

@ -1,7 +1,7 @@
Source: fractorium Source: fractorium
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Gambhiro Bhikkhu <matt.feemster@gmail.com> 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, libopenexr22, libopenexr-dev
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: http://fractorium.com/ Homepage: http://fractorium.com/

2
debian/copyright vendored
View File

@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: fractorium Upstream-Name: fractorium
Source: https://github.com/mfeemster/fractorium Source: https://bitbucket.org/mfeemster/fractorium
Files: * Files: *
Copyright: 2018 Matt Feemster <matt.feemster@gmail.com> Copyright: 2018 Matt Feemster <matt.feemster@gmail.com>

1
package-linux.sh
View File

@ -121,6 +121,7 @@ tar --exclude='package-linux.sh' \
./Data/Mica_Group.ugr \ ./Data/Mica_Group.ugr \
./Data/Quartz_Varieties.ugr \ ./Data/Quartz_Varieties.ugr \
./Data/dark_linux.qss \ ./Data/dark_linux.qss \
./Data/lightdark.qss \
. .
[ $? -ne 0 ] && echo "Tar command failed." && exit 2 [ $? -ne 0 ] && echo "Tar command failed." && exit 2