hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp
This commit is contained in:
Thulinma 2018-03-20 15:11:19 +01:00
commit e06b14ce77
9 changed files with 428 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -178,6 +178,7 @@ set(libHeaders
lib/riff.h
lib/ebml.h
lib/ebml_socketglue.h
lib/websocket.h
)
########################################
@ -231,6 +232,7 @@ add_library (mist
lib/riff.cpp
lib/ebml.cpp
lib/ebml_socketglue.cpp
lib/websocket.cpp
)
if (NOT APPLE)
set (LIBRT -lrt)