From 7b080e8fc3100a0a4346f21d039a2737e1187ea1 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 6 Apr 2015 11:23:09 -0400
Subject: [PATCH 1/2] fix style copying for linux app on osx - refs #511 /
 e69beba4d1

---
 gyp/styles.gypi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gyp/styles.gypi b/gyp/styles.gypi
index e1cd344fe..2c8772a87 100644
--- a/gyp/styles.gypi
+++ b/gyp/styles.gypi
@@ -19,7 +19,7 @@
       'hard_dependency': 1,
       'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
       'conditions': [
-        ['OS == "mac"', {
+        ['platform_lib == "osx"', {
           'direct_dependent_settings': {
             'mac_bundle_resources': [ '../styles/styles' ],
           }

From 02735b0e6d5f4469910787ee293ded6aeb3a41ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Mon, 20 Apr 2015 11:34:02 +0200
Subject: [PATCH 2/2] default to CGL on OS X

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 434645c81..14f78ed0f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ ANDROID_ABI ?= arm-v7
 
 ifeq ($(shell uname -s), Darwin)
 HOST ?= osx
+HEADLESS ?= cgl
 JOBS ?= $(shell sysctl -n hw.ncpu)
 endif
 HOST ?= linux