1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 16:32:33 +02:00
Commit Graph

7 Commits

Author SHA1 Message Date
Elias Steurer
c6ac701875 Merge branch 'master' into 106-remove-ffmpeg-download
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/src/util.cpp
#	install_dependencies_linux_mac.sh
#	install_dependencies_windows.bat
2020-09-18 16:17:59 +02:00
Elias Steurer
d009540d8e Fix vcpkg using old commit 2020-09-11 16:41:45 +02:00
Elias Steurer
1b8e708836 Replace qt-breakpad with sentry.io 2020-09-11 16:33:27 +02:00
Elias Steurer
d850a05aa8 Add ffmpeg to vcpkg dependencies 2020-09-10 17:32:24 +02:00
Elias Steurer
49747b50a9 Remove no longer used nlohman-json 2020-08-10 21:57:55 +02:00
Elias Steurer
1cca1d028f Update vcpkg install method 2020-04-30 20:18:27 +02:00
Elias Steurer
c7fd69a78e Add first working cmake version for ScreenPlay
Refactor stomt sdk from qmake/github to cmake/gitlab
2020-04-30 20:03:14 +02:00