Link with static_library version of libgtk2ui

2015-04-08 04:08:21 +00:00 · 2015-04-08 04:08:21 +00:00 · c5f8e4360c
commit c5f8e4360c
parent a7f7834be9
2 changed files with 16 additions and 4 deletions
--- a/brightray/brightray.gyp
+++ b/brightray/brightray.gyp
@ -110,9 +110,21 @@
              '<!@(pkg-config --libs-only-l gtk+-2.0 libnotify dbus-1 x11 xrandr xext gconf-2.0)',
            ],
          },
-        }],
-        ['OS=="linux" and libchromiumcontent_component==0', {
-          '<(libchromiumcontent_dir)/libboringssl.so',
+          'conditions': [
+            ['libchromiumcontent_component', {
+              'link_settings': {
+                'libraries': [
+                  '<(libchromiumcontent_dir)/libgtk2ui.a',
+                ],
+              },
+            }, {
+              'link_settings': {
+                'libraries': [
+                  '<(libchromiumcontent_dir)/libboringssl.so',
+                ],
+              },
+            }],
+          ],
        }],
        ['OS=="mac"', {
          'link_settings': {
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@ -1 +1 @@
-Subproject commit c9c7f2f62ec12521956281bc71869688213bd759
+Subproject commit c94e623f5951db672958f10b098808fc2017ea40