generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove include_dirs from video_capture.

Browse Source 
BUG=1662
TEST=compile on trybots
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2303005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4880 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-09-30 15:32:10 +00:00
parent 4cd76221dc
commit 1c974ef5e3
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_capture/mac/video_capture_mac.mm
View File

@ -27,8 +27,8 @@
#include <QuickTime/video_capture_quick_time.h> #include <QuickTime/video_capture_quick_time.h>
#include <QuickTime/video_capture_quick_time_info.h> #include <QuickTime/video_capture_quick_time_info.h>
#else #else
#include <QTKit/video_capture_qtkit.h> #include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h"
#include <QTKit/video_capture_qtkit_info.h> #include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h"
#endif #endif
namespace webrtc namespace webrtc

20
webrtc/modules/video_capture/video_capture.gypi
View File

@ -16,11 +16,6 @@
'<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [
'include',
'../interface',
'<(webrtc_root)/common_video/libyuv/include',
],
'sources': [ 'sources': [
'device_info_impl.cc', 'device_info_impl.cc',
'device_info_impl.h', 'device_info_impl.h',
@ -42,9 +37,6 @@
}, { # include_internal_video_capture == 1 }, { # include_internal_video_capture == 1
'conditions': [ 'conditions': [
['OS=="linux"', { ['OS=="linux"', {
'include_dirs': [
'linux',
],
'sources': [ 'sources': [
'linux/device_info_linux.cc', 'linux/device_info_linux.cc',
'linux/device_info_linux.h', 'linux/device_info_linux.h',
@ -65,9 +57,6 @@
'mac/qtkit/video_capture_qtkit_utility.h', 'mac/qtkit/video_capture_qtkit_utility.h',
'mac/video_capture_mac.mm', 'mac/video_capture_mac.mm',
], ],
'include_dirs': [
'mac',
],
'link_settings': { 'link_settings': {
'xcode_settings': { 'xcode_settings': {
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
@ -80,9 +69,6 @@
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses', '<(DEPTH)/third_party/winsdk_samples/winsdk_samples.gyp:directshow_baseclasses',
], ],
'include_dirs': [
'windows',
],
'sources': [ 'sources': [
'windows/device_info_ds.cc', 'windows/device_info_ds.cc',
'windows/device_info_ds.h', 'windows/device_info_ds.h',
@ -105,9 +91,6 @@
}, },
}], # win }], # win
['OS=="android"', { ['OS=="android"', {
'include_dirs': [
'android',
],
'sources': [ 'sources': [
'android/device_info_android.cc', 'android/device_info_android.cc',
'android/device_info_android.h', 'android/device_info_android.h',
@ -154,9 +137,6 @@
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
], ],
'include_dirs': [
'include',
],
'sources': [ 'sources': [
'test/video_capture_unittest.cc', 'test/video_capture_unittest.cc',
'test/video_capture_main_mac.mm', 'test/video_capture_main_mac.mm',