From 74aeab8ac73cfc8228b9bbd530c3fd35700cbe74 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 4 Feb 2014 11:33:18 -0800
Subject: [PATCH] put png_cflags in cflags not includes to avoid gyp double
 completing with -I

---
 llmr.gyp | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 6 deletions(-)

diff --git a/llmr.gyp b/llmr.gyp
index 2a65b4a60..64042ff68 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -19,15 +19,41 @@
         'PUBLIC_HEADERS_FOLDER_PATH': 'include'
       },
       'include_dirs':[
-          './include',
+          './include'
+      ],
+      'cflags': [
           '<@(png_cflags)'
       ],
+      'xcode_settings': {
+        'OTHER_CPLUSPLUSFLAGS':[
+            '<@(png_cflags)'
+        ]
+      },
+      'conditions': [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'OTHER_LDFLAGS': [
+                '<@(png_libraries)'
+            ]
+          }
+        }, {
+          'libraries': [
+            '<@(png_libraries)'
+          ]
+        }]
+      ],
       'direct_dependent_settings': {
           'include_dirs':[
-              './include',
+              './include'
+          ],
+          'cflags': [
               '<@(png_cflags)'
           ],
-          # workaround xcode bug
+          'xcode_settings': {
+            'OTHER_CPLUSPLUSFLAGS':[
+                '<@(png_cflags)'
+            ]
+          },
           'conditions': [
             ['OS == "mac"', {
               'xcode_settings': {
@@ -60,15 +86,41 @@
         'PUBLIC_HEADERS_FOLDER_PATH': 'include'
       },
       'include_dirs':[
-          './include',
+          './include'
+      ],
+      'cflags': [
           '<@(png_cflags)'
       ],
+      'xcode_settings': {
+        'OTHER_CPLUSPLUSFLAGS':[
+            '<@(png_cflags)'
+        ]
+      },
+      'conditions': [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'OTHER_LDFLAGS': [
+                '<@(png_libraries)'
+            ]
+          }
+        }, {
+          'libraries': [
+            '<@(png_libraries)'
+          ]
+        }]
+      ],
       'direct_dependent_settings': {
           'include_dirs':[
-              './include',
+              './include'
+          ],
+          'cflags': [
               '<@(png_cflags)'
           ],
-          # workaround xcode bug
+          'xcode_settings': {
+            'OTHER_CPLUSPLUSFLAGS':[
+                '<@(png_cflags)'
+            ]
+          },
           'conditions': [
             ['OS == "mac"', {
               'xcode_settings': {