Bug 691234: Part 3/3: Add DOM binding for getUserMedia on Desktop; r=jst

Brli · Jul 12, 2012 · 3cfaff7 · 3cfaff7
1 parent 6eb5095
commit 3cfaff7
Show file tree

Hide file tree

Showing 4 changed files with 160 additions and 170 deletions.
diff --git a/browser/confvars.sh b/browser/confvars.sh
@@ -43,3 +43,4 @@ MOZ_PROFILE_MIGRATOR=1
 MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBAPP_RUNTIME=1
+MOZ_MEDIA_NAVIGATOR=1
diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in
@@ -34,5 +34,11 @@ CPPSRCS = \
   MediaManager.cpp \
   $(NULL)
 
+ifdef MOZ_WEBRTC
+LOCAL_INCLUDES += \
+  -I$(topsrcdir)/media/webrtc/trunk/src \
+  $(NULL)
+endif
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk