Merge branch 'development' into LTS_development

2020-03-09 20:01:43 +01:00 · 2020-03-09 20:01:43 +01:00 · 69253082ca
commit 69253082ca
parent 29bc96d8d7 ae6ccb3615
12 changed files with 847 additions and 99 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -187,6 +187,7 @@ set(libHeaders
  lib/ebml_socketglue.h
  lib/websocket.h
  lib/url.h
+  lib/urireader.h
 )

 ########################################
@ -242,6 +243,7 @@ add_library (mist
  lib/ebml_socketglue.cpp
  lib/websocket.cpp
  lib/url.cpp
+  lib/urireader.cpp
 )
 if (NOT APPLE)
  set (LIBRT -lrt)