png is a new dependency in sprite.cpp - add it to build system

1 files changed, 22 insertions, 15 deletions

diff --git a/llmr.gyp b/llmr.gyp
index d68c927039..3961dccc52 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -6,44 +6,46 @@
   'targets': [
     {
       'target_name': 'llmr-osx',
-      'product_name': 'libllmr-osx',
+      'product_name': 'llmr-osx',
       'type': 'static_library',
       'sources': [
         '<!@(find src -name "*.cpp")',
         '<!@(find include -name "*.hpp")'
       ],
+      'libraries': [
+        '<@(png_libraries)',
+      ],
       'xcode_settings': {
         'SDKROOT': 'macosx',
         'SUPPORTED_PLATFORMS':'macosx',
         'MACOSX_DEPLOYMENT_TARGET':'10.8',
         'PUBLIC_HEADERS_FOLDER_PATH': 'include'
       },
-      'conditions': [
-        ['OS == "mac"', {
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-            ],
-          },
-        }],
-      ],
       'include_dirs':[
-          './include'
+          './include',
+          '<@(png_cflags)'
       ],
       'direct_dependent_settings': {
           'include_dirs':[
-              './include'
+              './include',
+              '<@(png_cflags)'
           ],
+          'libraries': [
+            '<@(png_libraries)',
+          ]
       }
     },
     {
       'target_name': 'llmr-ios',
-      'product_name': 'libllmr-ios',
+      'product_name': 'llmr-ios',
       'type': 'static_library',
       'sources': [
         '<!@(find src -name "*.cpp")',
         '<!@(find include -name "*.hpp")'
       ],
+      'libraries': [
+        '<@(png_libraries)',
+      ],
       'xcode_settings': {
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS':'iphonesimulator iphoneos',
@@ -53,12 +55,17 @@
         'PUBLIC_HEADERS_FOLDER_PATH': 'include'
       },
       'include_dirs':[
-          './include'
+          './include',
+          '<@(png_cflags)'
       ],
       'direct_dependent_settings': {
           'include_dirs':[
-              './include'
+              './include',
+              '<@(png_cflags)'
           ],
+          'libraries': [
+            '<@(png_libraries)',
+          ]
       }
     }
   ]