Merge pull request #860 from rprichard/master

Move Linux pkg-config dependencies from atom-shell to brightray.
2014-11-25 21:23:49 +08:00 · 2014-11-25 21:23:49 +08:00 · 85a3e06718
commit 85a3e06718
parent 8278d8b51a 73ee24bd98
2 changed files with 1 additions and 5 deletions
--- a/atom.gyp
+++ b/atom.gyp
@ -589,10 +589,6 @@
              '-rpath \$$ORIGIN',
              # Make native module dynamic loading work.
              '-rdynamic',
-              '<!@(pkg-config --libs-only-L --libs-only-other dbus-1 x11 xrandr xext gconf-2.0)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l dbus-1 x11 xrandr xext gconf-2.0)',
            ],
          },
          # Required settings of using breakpad.
--- a/vendor/brightray
+++ b/vendor/brightray
@ -1 +1 @@
-Subproject commit 313defa8a49c45250014e7c4ec2275d50dfd490d
+Subproject commit 40ad83fb158c9be1e0df277d19794c33fd80ff28