Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Side by Side Diff: talk/libjingle.gyp

Issue 1306243013: Remove x11 from libjingle_media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Outright removing X11 for libjingle media (does not appear to be used)" Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 'cflags': [ 553 'cflags': [
554 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)', 554 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
555 ], 555 ],
556 }], 556 }],
557 ], 557 ],
558 'include_dirs': [ 558 'include_dirs': [
559 'third_party/libudev' 559 'third_party/libudev'
560 ], 560 ],
561 'libraries': [ 561 'libraries': [
562 '-lrt', 562 '-lrt',
563 '-lXext',
564 '-lX11',
565 ], 563 ],
566 }], 564 }],
567 ['OS=="win"', { 565 ['OS=="win"', {
568 'sources': [ 566 'sources': [
569 'media/devices/gdivideorenderer.cc', 567 'media/devices/gdivideorenderer.cc',
570 'media/devices/gdivideorenderer.h', 568 'media/devices/gdivideorenderer.h',
571 'media/devices/win32deviceinfo.cc', 569 'media/devices/win32deviceinfo.cc',
572 'media/devices/win32devicemanager.cc', 570 'media/devices/win32devicemanager.cc',
573 'media/devices/win32devicemanager.h', 571 'media/devices/win32devicemanager.h',
574 ], 572 ],
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 ['OS=="android" and build_with_chromium==0', { 774 ['OS=="android" and build_with_chromium==0', {
777 'sources': [ 775 'sources': [
778 'app/webrtc/androidvideocapturer.h', 776 'app/webrtc/androidvideocapturer.h',
779 'app/webrtc/androidvideocapturer.cc', 777 'app/webrtc/androidvideocapturer.cc',
780 ], 778 ],
781 }], 779 }],
782 ], 780 ],
783 }, # target libjingle_peerconnection 781 }, # target libjingle_peerconnection
784 ], 782 ],
785 } 783 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698