mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux/Windows sync.

Browse Source
This commit is contained in:
mfeemster 2014-12-11 15:13:26 -08:00
parent 6abd04058a
commit f32eaadd3d
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/QtCreator/EmberCL/EmberCL.pro
View File

@ -9,7 +9,7 @@ VERSION = 0.1.4.7
DESTDIR = ../../../Bin
LIBS += -L/usr/lib -lOpenCL
#LIBS += -L/usr/lib -lGL
LIBS += -L/usr/lib -lGL
INCLUDEPATH += /usr/include/CL
INCLUDEPATH += /usr/include/GL

2
Builds/QtCreator/Fractorium/Fractorium.pro
View File

@ -16,7 +16,7 @@ VERSION = 0.1.4.7
DESTDIR = ../../../Bin
LIBS += -L/usr/lib -lOpenCL
#LIBS += -L/usr/lib -lGL
LIBS += -L/usr/lib -lGL
LIBS += -L/usr/lib -ljpeg
LIBS += -L/usr/lib -lpng
LIBS += -L/usr/lib -ltbb

15
Source/Fractorium/FractoriumPch.h
View File

@ -1,6 +1,13 @@
#define GL_GLEXT_PROTOTYPES 1
#define XFORM_COLOR_COUNT 14
#undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used.
#define QT_NO_OPENGL_ES_2
#ifndef WIN32
#include <QtWidgets>
#endif
#include "Renderer.h"
#include "RendererCL.h"
#include "VariationList.h"
@ -10,11 +17,12 @@
#include "SheepTools.h"
#include "JpegUtils.h"
#include "EmberCommon.h"
#include <deque>
#undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used.
#define QT_NO_OPENGL_ES_2
#ifdef WIN32
#include <QtWidgets>
#endif
#include <deque>
#include <QLineEdit>
#include <QSpinBox>
#include <QDoubleSpinBox>
@ -28,7 +36,6 @@
#include <QSettings>
#include <QStandardPaths>
#include <QGLWidget>
//#include <QOpenGLFunctions_2_0.h>
#include <qopenglfunctions_2_0.h>
#include <QtWidgets/QMainWindow>
#include <QFuture>