Browse files

Bug 688178: Windows 32 bustage fix from the merge

  • Loading branch information...
1 parent b2526ac commit 410d34c90e034fa5bd2807da2f53aaa610d53f80 @jesup jesup committed Apr 27, 2012
Showing with 7 additions and 3 deletions.
  1. +7 −3 media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
View
10 media/webrtc/trunk/src/modules/video_capture/main/source/video_capture.gypi
@@ -92,9 +92,13 @@
},
},
}], # mac
- ['OS=="win" and build_with_mozilla==0', {
- 'dependencies': [
- '<(webrtc_root)/modules/video_capture/main/source/Windows/direct_show_base_classes.gyp:direct_show_base_classes',
+ ['OS=="win"', {
+ 'conditions': [
+ ['build_with_mozilla==0', {
+ 'dependencies': [
+ '<(webrtc_root)/modules/video_capture/main/source/Windows/direct_show_base_classes.gyp:direct_show_base_classes',
+ ],
+ }],
],
'include_dirs': [
'Windows',

0 comments on commit 410d34c

Please sign in to comment.