From 6576f4b290d92d3bb4532607c8c3b99274ed99c7 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <simon@highlyillogical.org>
Date: Wed, 14 Jan 2015 09:40:32 +0000
Subject: [PATCH] Fix ember library includes for osx

---
 Source/Ember/EmberPch.h   | 22 ++++++++++++++--------
 Source/Ember/XmlToEmber.h |  4 ++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Source/Ember/EmberPch.h b/Source/Ember/EmberPch.h
index e91ed62..c05af4b 100644
--- a/Source/Ember/EmberPch.h
+++ b/Source/Ember/EmberPch.h
@@ -35,7 +35,11 @@
 #include <iostream>
 #include <iomanip>
 #include <limits>
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 #include <math.h>
 #include <memory>
 #include <numeric>
@@ -55,19 +59,21 @@
 #endif
 
 //Intel's Threading Building Blocks is what's used for all threading.
-#include "tbb/task_group.h"
-#include "tbb/parallel_for.h"
-#include "tbb/task_scheduler_init.h"
+#include <tbb/task_group.h>
+#include <tbb/parallel_for.h>
+#include <tbb/task_scheduler_init.h>
 
 #define GLM_FORCE_RADIANS 1
+#ifndef __APPLE__
 #define GLM_FORCE_INLINE 1
+#endif
 
 //glm is what's used for matrix math.
-#include "glm/glm.hpp"
-#include "glm/detail/type_int.hpp"
-#include "glm/gtc/matrix_transform.hpp"
-#include "glm/gtc/type_ptr.hpp"
-#include "glm/gtx/string_cast.hpp"
+#include <glm/glm.hpp>
+#include <glm/detail/type_int.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtx/string_cast.hpp>
 
 using namespace tbb;
 using namespace std;
diff --git a/Source/Ember/XmlToEmber.h b/Source/Ember/XmlToEmber.h
index 0f7869f..ac23c43 100644
--- a/Source/Ember/XmlToEmber.h
+++ b/Source/Ember/XmlToEmber.h
@@ -4,6 +4,10 @@
 #include "PaletteList.h"
 #include "VariationList.h"
 
+#ifdef __APPLE__
+#include <libgen.h>
+#endif
+
 /// <summary>
 /// XmlToEmber and Locale classes.
 /// </summary>