From 905affd76e78f634a58a322540df271efd8be5d0 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Thu, 31 Oct 2013 11:36:26 -0600
Subject: [PATCH] QuartzSupport and header changes for OS X.

---
 Makefile.in                | 7 ++++++-
 src/gfx/2d/QuartzSupport.h | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fcf49b2..a2fd128 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,12 +120,15 @@ AZURE_CPP_SRC += \
 	src/gfx/2d/PathCG.cpp \
 	src/gfx/2d/SourceSurfaceCG.cpp \
 	$(NULL)
+
+AZURE_OBJCPP_SRC = src/gfx/2d/QuartzSupport.mm
 endif
 
 ifeq ($(OSTYPE),linux)
 CXXFLAGS += \
 	-DXP_UNIX \
 	$(NULL)
+AZURE_OBJCPP_SRC =
 
 CXXFLAGS += -DMOZ_ENABLE_FREETYPE
 AZURE_CPP_SRC += \
@@ -138,6 +141,7 @@ ifeq ($(OSTYPE),android)
     -DXP_UNIX \
     -DSK_BUILD_FOR_ANDROID \
     $(NULL)
+    AZURE_OBJCPP_SRC =
 
     CXXFLAGS += -DMOZ_ENABLE_FREETYPE
     AZURE_CPP_SRC += \
@@ -146,7 +150,8 @@ ifeq ($(OSTYPE),android)
 endif
 
 ALL_CPP_SRC = $(MOZALLOC_CPP_SRC) $(AZURE_CPP_SRC)
-ALL_OBJS = $(ALL_CPP_SRC:%.cpp=%.o)
+ALL_OBJCPP_SRC = $(AZURE_OBJCPP_SRC)
+ALL_OBJS = $(ALL_CPP_SRC:%.cpp=%.o) $(ALL_OBJCPP_SRC:%.mm=%.o)
 
 RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
 
diff --git a/src/gfx/2d/QuartzSupport.h b/src/gfx/2d/QuartzSupport.h
index 69634a2..b89f545 100644
--- a/src/gfx/2d/QuartzSupport.h
+++ b/src/gfx/2d/QuartzSupport.h
@@ -8,7 +8,8 @@
 #define nsCoreAnimationSupport_h__
 #ifdef XP_MACOSX
 
-#import <OpenGL/OpenGL.h>
+#import <OpenGL/gl.h>
+#import <OpenGL/glext.h>
 #import "ApplicationServices/ApplicationServices.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/gfx/MacIOSurface.h"