From 6abd04058afa13071199a1d2be7219f6f13df474 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Thu, 11 Dec 2014 09:02:42 -0800 Subject: [PATCH] Windows/Linux sync. --- Source/Ember/EmberPch.h | 3 ++- Source/Fractorium/FractoriumPch.h | 30 +++++++++++++----------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Source/Ember/EmberPch.h b/Source/Ember/EmberPch.h index 4701895..e91ed62 100644 --- a/Source/Ember/EmberPch.h +++ b/Source/Ember/EmberPch.h @@ -59,7 +59,8 @@ #include "tbb/parallel_for.h" #include "tbb/task_scheduler_init.h" -#define GLM_FORCE_RADIANS +#define GLM_FORCE_RADIANS 1 +#define GLM_FORCE_INLINE 1 //glm is what's used for matrix math. #include "glm/glm.hpp" diff --git a/Source/Fractorium/FractoriumPch.h b/Source/Fractorium/FractoriumPch.h index d250744..1b7d9cd 100644 --- a/Source/Fractorium/FractoriumPch.h +++ b/Source/Fractorium/FractoriumPch.h @@ -1,5 +1,16 @@ -#define GL_GLEXT_PROTOTYPES -#define GLM_FORCE_INLINE 1 +#define GL_GLEXT_PROTOTYPES 1 +#define XFORM_COLOR_COUNT 14 + +#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 #undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used. #define QT_NO_OPENGL_ES_2 @@ -23,25 +34,10 @@ #include #include -#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 - -#define GLM_FORCE_RADIANS - #include "glm/glm.hpp" #include "glm/gtc/matrix_transform.hpp" #include "glm/gtc/type_ptr.hpp" -#define XFORM_COLOR_COUNT 14 - #ifndef WIN32 #undef Bool #endif