mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-05 15:54:50 -04:00
More linux work.
This commit is contained in:
@ -1,18 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#define GL_GLEXT_PROTOTYPES
|
||||
#define GLM_FORCE_INLINE 1
|
||||
|
||||
#include "Renderer.h"
|
||||
#include "RendererCL.h"
|
||||
#include "VariationList.h"
|
||||
#include "OpenCLWrapper.h"
|
||||
#include "XmlToEmber.h"
|
||||
#include "EmberToXml.h"
|
||||
#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
|
||||
#include <QtWidgets>
|
||||
@ -29,11 +17,23 @@
|
||||
#include <QSettings>
|
||||
#include <QStandardPaths>
|
||||
#include <QGLWidget>
|
||||
#include <QOpenGLFunctions_2_0.h>
|
||||
//#include <QOpenGLFunctions_2_0.h>
|
||||
#include <qopenglfunctions_2_0.h>
|
||||
#include <QtWidgets/QMainWindow>
|
||||
#include <QFuture>
|
||||
#include <QtConcurrentRun>
|
||||
|
||||
#include "Renderer.h"
|
||||
#include "RendererCL.h"
|
||||
#include "VariationList.h"
|
||||
#include "OpenCLWrapper.h"
|
||||
#include "XmlToEmber.h"
|
||||
#include "EmberToXml.h"
|
||||
#include "SheepTools.h"
|
||||
#include "JpegUtils.h"
|
||||
#include "EmberCommon.h"
|
||||
#include <deque>
|
||||
|
||||
#define GLM_FORCE_RADIANS
|
||||
|
||||
#include "glm/glm.hpp"
|
||||
@ -42,6 +42,10 @@
|
||||
|
||||
#define XFORM_COLOR_COUNT 14
|
||||
|
||||
#ifndef WIN32
|
||||
#undef Bool
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
using namespace EmberNs;
|
||||
using namespace EmberCLns;
|
||||
using namespace EmberCLns;
|
||||
|
Reference in New Issue
Block a user