Merge branch 'master' into nunicode

2014-11-17 18:19:28 +01:00
parent b9ebe16224 2408ea30c9
commit ee7bd196fb
1 changed files with 1 additions and 0 deletions
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -22,6 +22,7 @@
            'conditions': [
              ['OS == "linux"', {
                  'other_ldflags': [
+                      '<@(png_static_libs)',
                      '<@(glfw3_static_libs)',
                      '<@(glfw3_ldflags)',
                  ]