diff options
| author | phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-11-16 15:36:44 +0000 |
|---|---|---|
| committer | phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-11-16 15:36:44 +0000 |
| commit | 337dc68992cbf200125c8a5194896d36eb1b7b6d (patch) | |
| tree | a8123a32fea3fb832402fb794271868823f88292 /webrtc.gyp | |
| parent | af26f646165e7e2a8747fd54e92e73f48118a807 (diff) | |
| download | webrtc-337dc68992cbf200125c8a5194896d36eb1b7b6d.tar.gz | |
Included modules in webrtc.gyp and fixed build errors.
Removed TODO from webrtc.gyp since it is done.
Tabs -> spaces.
Tabs -> spaces.
Tabs -> spaces.
Fixed compilation on Windows.
Added missing file.
Merge branch 'master' into fix_mac_modules
Fixed compilation errors for the modules.gyp on Mac. This included some pretty large refactorings.
Please enter the commit message for your changes. Lines starting
BUG=
TEST=
Review URL: http://webrtc-codereview.appspot.com/269005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@957 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc.gyp')
| -rw-r--r-- | webrtc.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webrtc.gyp b/webrtc.gyp index 19844be36e..d7c307ca94 100644 --- a/webrtc.gyp +++ b/webrtc.gyp @@ -17,8 +17,7 @@ 'dependencies': [ 'src/common_audio/common_audio.gyp:*', 'src/common_video/common_video.gyp:*', - # TODO(andrew): enable this when all tests build. - #'src/modules/modules.gyp:*', + 'src/modules/modules.gyp:*', 'src/system_wrappers/source/system_wrappers.gyp:*', 'src/video_engine/video_engine.gyp:*', 'src/voice_engine/voice_engine.gyp:*', |