From d9f132fe93caf8d5e2522e06faeac1a57a30660a Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Mon, 3 Feb 2014 15:50:05 -0800
Subject: [PATCH] fix 'make xapp' target after new png dependency

---
 llmr.gyp | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/llmr.gyp b/llmr.gyp
index 3961dccc5..2a65b4a60 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -12,9 +12,6 @@
         '<!@(find src -name "*.cpp")',
         '<!@(find include -name "*.hpp")'
       ],
-      'libraries': [
-        '<@(png_libraries)',
-      ],
       'xcode_settings': {
         'SDKROOT': 'macosx',
         'SUPPORTED_PLATFORMS':'macosx',
@@ -30,8 +27,19 @@
               './include',
               '<@(png_cflags)'
           ],
-          'libraries': [
-            '<@(png_libraries)',
+          # workaround xcode bug
+          'conditions': [
+            ['OS == "mac"', {
+              'xcode_settings': {
+                'OTHER_LDFLAGS': [
+                    '<@(png_libraries)'
+                ]
+              }
+            }, {
+              'libraries': [
+                '<@(png_libraries)'
+              ]
+            }]
           ]
       }
     },
@@ -43,9 +51,6 @@
         '<!@(find src -name "*.cpp")',
         '<!@(find include -name "*.hpp")'
       ],
-      'libraries': [
-        '<@(png_libraries)',
-      ],
       'xcode_settings': {
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS':'iphonesimulator iphoneos',
@@ -63,8 +68,19 @@
               './include',
               '<@(png_cflags)'
           ],
-          'libraries': [
-            '<@(png_libraries)',
+          # workaround xcode bug
+          'conditions': [
+            ['OS == "mac"', {
+              'xcode_settings': {
+                'OTHER_LDFLAGS': [
+                    '<@(png_libraries)'
+                ]
+              }
+            }, {
+              'libraries': [
+                '<@(png_libraries)'
+              ]
+            }]
           ]
       }
     }