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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2021-04-23 12:43:29 +02:00
commit ee6f1f1390
16 changed files with 1039 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -482,6 +482,7 @@ add_executable(MistOutHTTP
generated/dashjs.js.h
generated/videojs.js.h
generated/webrtc.js.h
generated/mews.js.h
generated/player_dash.js.h
generated/player_dash_lic.js.h
generated/player_video.js.h
@ -574,6 +575,10 @@ add_custom_command(OUTPUT generated/webrtc.js.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/min/wrappers/webrtc.js webrtc_js generated/webrtc.js.h
DEPENDS sourcery ${SOURCE_DIR}/embed/min/wrappers/webrtc.js
)
add_custom_command(OUTPUT generated/mews.js.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/min/wrappers/mews.js mews_js generated/mews.js.h
DEPENDS sourcery ${SOURCE_DIR}/embed/min/wrappers/mews.js
)
# players
add_custom_command(OUTPUT generated/player_dash_lic.js.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/players/dash.js.license.js player_dash_lic_js generated/player_dash_lic.js.h