Merge pull request #1207 from mapbox/fix-linux-app-on-osx-host

Fix linux app on osx host
2015-04-20 11:56:19 +02:00
parent f80238577c 02735b0e6d
commit 86d8029e20
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@@ -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
--- 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' ],
          }