mirror of
				https://bitbucket.org/mfeemster/fractorium.git
				synced 2025-11-03 17:50:27 -05:00 
			
		
		
		
	Merge branch 'master' of https://github.com/mfeemster/fractorium.git
This commit is contained in:
		@ -12,13 +12,13 @@ Install the dependencies.
 | 
			
		||||
For Ubuntu 15.04 (vivid) and 15.10 (wily):
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
sudo apt-get install g++ libgl1-mesa-dev libgl-dev libglm-dev libjpeg-dev libpng12-dev libtbb-dev libxml2-dev qt5-default qt5-qmake qtbase5-dev libqt5opengl5-dev ocl-icd-libopencl1 ocl-icd-opencl-dev opencl-headers
 | 
			
		||||
sudo apt-get install g++ libgl1-mesa-dev libgl-dev libglm-dev libjpeg-dev libpng12-dev libqt5opengl5-dev libtbb-dev libxml2-dev ocl-icd-libopencl1 ocl-icd-opencl-dev opencl-headers qt5-default qt5-qmake qtbase5-dev
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Install the OpenCL drivers and opencl support for your hardware. For AMD get their drivers from their site, build and install .deb package. For Nvidia:
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
sudo apt-get install nvidia-352 nvidia-352-dev nvidia-opencl-icd-352 nvidia-libopencl1-352 nvidia-prime nvidia-modprobe
 | 
			
		||||
sudo apt-get install nvidia-352 nvidia-352-dev nvidia-libopencl1-352 nvidia-modprobe nvidia-opencl-dev nvidia-opencl-icd-352 nvidia-prime
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Note: There may be a more recent release on their site.
 | 
			
		||||
 | 
			
		||||
@ -9,7 +9,7 @@ of the cuburn algorithm in OpenCL.
 | 
			
		||||
 | 
			
		||||
## Windows
 | 
			
		||||
 | 
			
		||||
Download: [Fractorium_Beta_0.9.9.4.msi](https://drive.google.com/file/d/0Bws5xPbHJph6QUw0aVVlRTN6Z0U/view?usp=sharing)
 | 
			
		||||
Download: [Fractorium_Beta_0.9.9.5.msi](https://drive.google.com/file/d/0Bws5xPbHJph6RUwwbTN5RkdneDQ/view?usp=sharing)
 | 
			
		||||
 | 
			
		||||
## Linux
 | 
			
		||||
 | 
			
		||||
@ -31,11 +31,11 @@ sudo apt-get install fractorium
 | 
			
		||||
 | 
			
		||||
### Install from .deb
 | 
			
		||||
 | 
			
		||||
Download: [fractorium_0.9.9.4-0ubuntu1_amd64.deb](https://launchpad.net/~fractorium/+archive/ubuntu/ppa/+files/fractorium_0.9.9.4-0ubuntu1_amd64.deb)
 | 
			
		||||
Download: [fractorium_0.9.9.5-0ubuntu1_amd64.deb](https://launchpad.net/~fractorium/+archive/ubuntu/ppa/+files/fractorium_0.9.9.5-0ubuntu1_amd64.deb)
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
cd ~/Downloads
 | 
			
		||||
sudo dpkg -i fractorium_0.9.9.4-0ubuntu1_amd64.deb
 | 
			
		||||
sudo dpkg -i fractorium_0.9.9.5-0ubuntu1_amd64.deb
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Mac OS/X (10.9+)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,9 @@
 | 
			
		||||
fractorium (0.9.9.5-0ubuntu1) wily; urgency=low
 | 
			
		||||
 | 
			
		||||
  * release 0.9.9.5
 | 
			
		||||
 | 
			
		||||
 -- Gambhiro Bhikkhu <gambhiro.bhikkhu.85@gmail.com>  Mon, 07 Mar 2016 15:26:36 +0000
 | 
			
		||||
 | 
			
		||||
fractorium (0.9.9.4-0ubuntu1) wily; urgency=low
 | 
			
		||||
 | 
			
		||||
  * release 0.9.9.4
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								debian/control
									
									
									
									
										vendored
									
									
								
							@ -2,7 +2,7 @@ Source: fractorium
 | 
			
		||||
Section: graphics
 | 
			
		||||
Priority: optional
 | 
			
		||||
Maintainer: Gambhiro Bhikkhu <gambhiro.bhikkhu.85@gmail.com>
 | 
			
		||||
Build-Depends: debhelper (>= 9), g++ (>= 4.9), libdbus-1-dev, libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng12-dev, libtbb-dev, libxml2-dev, qt5-default, qt5-qmake, qtbase5-dev, libqt5opengl5-dev, ocl-icd-libopencl1
 | 
			
		||||
Build-Depends: debhelper (>= 9), g++ (>= 4.9), libgl1-mesa-dev, libgl-dev, libglm-dev, libjpeg-dev, libpng12-dev, libqt5opengl5-dev, libtbb-dev, libxml2-dev, ocl-icd-libopencl1, ocl-icd-opencl-dev, opencl-headers, qt5-default, qt5-qmake, qtbase5-dev
 | 
			
		||||
Standards-Version: 3.9.5
 | 
			
		||||
Homepage: http://mfeemster.deviantart.com/
 | 
			
		||||
Vcs-Git: https://github.com/mfeemster/fractorium
 | 
			
		||||
 | 
			
		||||
@ -46,9 +46,6 @@ if [ ! -d '.git' -o ! -f 'main.pro' ]; then
 | 
			
		||||
	exit 2
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# Make sure create-symlinks.sh will be executable.
 | 
			
		||||
chmod +x ./Builds/create-symlinks.sh
 | 
			
		||||
 | 
			
		||||
# Set defaults.
 | 
			
		||||
OPT_BUILD_BINARY=0
 | 
			
		||||
OPT_BUILD_SOURCE=1
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user