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-09-01 11:21:13 +02:00
commit 2f8a702c38
16 changed files with 307 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -483,10 +483,12 @@ add_executable(MistOutHTTP
generated/videojs.js.h
generated/webrtc.js.h
generated/mews.js.h
generated/flv.js.h
generated/player_dash.js.h
generated/player_dash_lic.js.h
generated/player_video.js.h
generated/player_webrtc.js.h
generated/player_flv.js.h
generated/skin_default.css.h
generated/skin_dev.css.h
generated/skin_videojs.css.h
@ -579,6 +581,10 @@ 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
)
add_custom_command(OUTPUT generated/flv.js.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/min/wrappers/flv.js flv_js generated/flv.js.h
DEPENDS sourcery ${SOURCE_DIR}/embed/min/wrappers/flv.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
@ -596,6 +602,10 @@ add_custom_command(OUTPUT generated/player_webrtc.js.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/players/webrtc.js player_webrtc_js generated/player_webrtc.js.h
DEPENDS sourcery ${SOURCE_DIR}/embed/players/webrtc.js
)
add_custom_command(OUTPUT generated/player_flv.js.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/players/flv.min.js player_flv_js generated/player_flv.js.h
DEPENDS sourcery ${SOURCE_DIR}/embed/players/flv.js
)
# css
add_custom_command(OUTPUT generated/skin_default.css.h
COMMAND ./sourcery ${SOURCE_DIR}/embed/min/skins/default.css skin_default_css generated/skin_default.css.h