diff --git a/Builds/QtCreator/EmberCL/EmberCL.pro b/Builds/QtCreator/EmberCL/EmberCL.pro index 961898e..c3bea32 100644 --- a/Builds/QtCreator/EmberCL/EmberCL.pro +++ b/Builds/QtCreator/EmberCL/EmberCL.pro @@ -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 diff --git a/Builds/QtCreator/Fractorium/Fractorium.pro b/Builds/QtCreator/Fractorium/Fractorium.pro index c5a9418..7bf6fc1 100644 --- a/Builds/QtCreator/Fractorium/Fractorium.pro +++ b/Builds/QtCreator/Fractorium/Fractorium.pro @@ -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 diff --git a/Source/Fractorium/FractoriumPch.h b/Source/Fractorium/FractoriumPch.h index 1b7d9cd..7ba43d2 100644 --- a/Source/Fractorium/FractoriumPch.h +++ b/Source/Fractorium/FractoriumPch.h @@ -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 +#endif + #include "Renderer.h" #include "RendererCL.h" #include "VariationList.h" @@ -10,11 +17,12 @@ #include "SheepTools.h" #include "JpegUtils.h" #include "EmberCommon.h" -#include -#undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used. -#define QT_NO_OPENGL_ES_2 +#ifdef WIN32 #include +#endif + +#include #include #include #include @@ -28,7 +36,6 @@ #include #include #include -//#include #include #include #include