Merge remote-tracking branch 'origin/master'

viviemXD · Mar 14, 2012 · 31bbc94 · 31bbc94
2 parents fd94f11 + c66e77e
commit 31bbc94
Show file tree

Hide file tree

Showing 174 changed files with 39,596 additions and 29,585 deletions.
diff --git a/README b/README
@@ -297,3 +297,15 @@ python setup.py install
 Windows
 From http://www.scons.org/ download and install the scons windows installer 
 
+ ---------------------------------------------------
+14. Using Ikran with websocket-based ROAP Proxy
+---------------------------------------------------
+
+1. Start the roap proxy firstly.
+
+2. Start firefox with ikran add-on. Enter IP:7681 in address bar to load page. the IP is roap proxy ip.
+
+3. On page load you should see the RoapProxy register and then it will do the SIP conversation
+on behalf of your browser.  It currently only works for 1 call and needs to be reset between
+each call.
+
diff --git a/SConstruct b/SConstruct
@@ -287,6 +287,12 @@ SCRIPT_FILES += [
   'tests/testapp_softphone/SConstruct',
 ]
 
+if sys.platform in ['win32']:
+  SCRIPT_FILES += [
+    'third_party/libwebsocket/SConstruct_libwebsocket',
+    'tests/roapproxy/SConstruct',
+  ]
+
 if sys.platform in [ 'win32', 'linux2','darwin']:
   SCRIPT_FILES += [
     'third_party/gtest/SConstruct_gtestd',