1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-23 03:02:30 +01:00
Commit Graph

226 Commits

Author SHA1 Message Date
Elias Steurer
907658261e Merge remote-tracking branch 'origin/release' 2022-02-17 18:13:41 +01:00
Elias Steurer
626904a6c1 Change linux deploy to just copy...
everything from the qt installation
2022-02-17 18:13:32 +01:00
Elias Steurer
13192e2964 Update Qt version in build.py 2022-02-03 18:45:12 +01:00
Elias Steurer
a1fe840e54 Fix IFW path on linux ci 2022-01-29 12:24:26 +01:00
Elias Steurer
e55182cdaf Add some basic working in installer with cmake 3.23 2022-01-27 14:54:45 +01:00
Elias Steurer
a2ac33180e Fix build.py help 2022-01-09 16:56:56 +01:00
darkelaina
14a64c9340 Refactor build script 2022-01-04 09:12:03 +00:00
Elias Steurer
0f5b310f68 Merge branch 'master' into qt6-kde
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/src/screenplaymanager.cpp
#	Tools/build.py
2021-12-31 13:32:37 +01:00
Elias Steurer
6bfdd9894c Fix steam plugin loading 2021-12-18 13:24:03 +01:00
Elias Steurer
4f5bfe44d1 Add cpack based installer 2021-12-04 10:41:21 +01:00
Elias Steurer
eabe625cd9 Add cpack IFW installer
Update to Qt 6.2.2
2021-12-03 15:30:17 +01:00
Elias Steurer
6bd7deaa43 Update vcpkg
Fix compilation
Remove unused benchmark
2021-12-02 15:31:05 +01:00
Elias Steurer
797b4e205c Fix qt version 2021-11-13 14:30:55 +01:00
Elias Steurer
2216fc3351 Fix macos qt path and version 2021-11-12 15:32:30 +01:00
Elias Steurer
8615d7371f Add basic http server
this is for content like godot webasm
that is only able to be shown from a
webserver
2021-10-23 18:34:25 +02:00
Elias Steurer
223d6225c2 Merge branch 'master' into qt6-support
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/translations/ScreenPlay_pt_BR.ts
#	ScreenPlay/translations/ScreenPlay_zh_CN.ts
#	Tools/build.py
2021-10-08 10:13:44 +02:00
Elias Steurer
d4289c8e08 Fix steam build default from true/false to on/off 2021-10-07 17:22:10 +02:00
Elias Steurer
4146f2fbba Fix missing dlls 2021-10-03 17:45:44 +02:00
Elias Steurer
6b653bdfdc Merge branch 'master' into qt6-support
# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/qml/Workshop/Workshop.qml
#	ScreenPlay/qml/Workshop/upload/UploadProjectItem.qml
#	ScreenPlay/translations/ScreenPlay_.ts
#	ScreenPlay/translations/ScreenPlay_de.ts
#	ScreenPlay/translations/ScreenPlay_es.ts
#	ScreenPlay/translations/ScreenPlay_fr.ts
#	ScreenPlay/translations/ScreenPlay_ko.ts
#	ScreenPlay/translations/ScreenPlay_pt_br.ts
#	ScreenPlay/translations/ScreenPlay_ru.ts
#	ScreenPlay/translations/ScreenPlay_vi.qm
#	ScreenPlay/translations/ScreenPlay_vi.ts
#	ScreenPlay/translations/ScreenPlay_zh_cn.ts
2021-09-26 17:56:40 +02:00
Elias Steurer
0b9bd9c02c Remove SCREENPLAY_STEAM_DEPLOY
in the end it is the same as SCREENPLAY_STEAM
2021-09-26 16:52:14 +02:00
Elias Steurer
6b3fc174d4 Fix qt version 2021-09-10 12:47:21 +02:00
Elias Steurer
7883a98181 Change apple signing to run parallel 2021-09-04 21:50:34 +02:00
Elias Steurer
dca107efbb Add examples to python scripts 2021-09-04 12:13:19 +02:00
Elias Steurer
30acb08bcf Fix macOS build.py
It looks like these are the best settings to finally
create a working signation after many hours of experimenting
2021-09-03 13:03:48 +02:00
Elias Steurer
3a49341083 Merge remote-tracking branch 'origin/master' 2021-08-21 14:11:21 +02:00
Elias Steurer
01f4b656de Replace branch name with commit text
Branch name would always be master
2021-08-21 14:11:16 +02:00
Elias Steurer
41f66a236a Fix incorrect qmldir for mac deploy 2021-08-21 14:09:19 +02:00
Elias Steurer
becba82a77 Fix depot name 2021-08-21 13:37:24 +02:00
Elias Steurer
0f4b30492b Fix missing depot in temporary folder 2021-08-21 13:28:32 +02:00
Elias Steurer
202cd32bb4 Add default vdf config names for every platform
Makes sense to autodetect this.
2021-08-21 13:17:08 +02:00
Elias Steurer
ddcb83b79b Add steam publish python script with dynamic description based on git branch, hash and date 2021-08-21 12:53:19 +02:00
Elias Steurer
5d1f1121dd Fix missing entitlements needed by mac version of steam 2021-08-16 15:58:45 +02:00
Elias Steurer
d76d782e72 Add missing ffmpeg prebuild bin to setup for mac 2021-08-16 11:48:06 +02:00
Elias Steurer
6ea784ffed Fix explicit steam workshop build for build.py 2021-08-16 11:22:25 +02:00
Elias Steurer
79e3c39721 Add steam depot config 2021-08-14 14:34:55 +02:00
Elias Steurer
28a9dd3ec6 Add explicit steam deploy version flag
This simply disables the copy of the steam_appid.txt
2021-08-14 12:59:43 +02:00
Elias Steurer
fe0ab29cf8 Change mac signing to be opt in 2021-08-14 12:44:32 +02:00
Elias Steurer
538889465d Merge remote-tracking branch 'origin/master' 2021-08-08 19:33:20 +02:00
Elias Steurer
2d04ce2608 Add macOS code signing 2021-08-08 19:31:50 +02:00
Elias Steurer
5752a56d14 Add missing benchmark dependency 2021-07-25 16:31:05 +02:00
Elias Steurer
f521f94a6a Disable infoware for now because it wont compile 2021-07-25 16:21:16 +02:00
Elias Steurer
613a4d435d Test CI 2021-07-25 16:15:31 +02:00
Elias Steurer
e3a6193275 Fix macos compilation and workshop files 2021-07-25 12:26:55 +02:00
Elias Steurer
2448e9462e Update vcpkg 2021-06-25 12:42:03 +02:00
Elias Steurer
2fb51d20e4 Add curl to satisfy sentry 2021-06-25 12:35:41 +02:00
Elias Steurer
60bf972c26 Fix vcpkg command call 2021-06-25 12:32:19 +02:00
Elias Steurer
e118fa235c Add sentry support for macos
Fix cmake apple define because apple
is a unix system.
2021-06-12 15:17:38 +02:00
Elias Steurer
5add9d869e Fix setup script for macos and linux 2021-06-12 14:42:55 +02:00
Elias Steurer
1e29d44d7d Add ffmpeg and fix video import 2021-05-21 12:02:16 +02:00
Elias Steurer
3fd25dcbeb Change formatter to 6.1
6.1 actually now has support for some modern
qml features like inline components.
2021-05-16 19:35:05 +02:00
Elias Steurer
4001d1ddd2 Fix join of arguments being to early 2021-05-16 16:38:04 +02:00
Elias Steurer
1bb3cd36b0 Fix arch 2021-05-16 16:34:05 +02:00
Elias Steurer
201b7efe9a Remove timeout 2021-05-16 14:13:27 +02:00
Elias Steurer
71c422cbca Fix check for not set args.path 2021-05-16 14:10:37 +02:00
Elias Steurer
5164a7b916 Change CI to use setup.py 2021-05-16 13:12:24 +02:00
Elias Steurer
20be6ba4a9 Refacot setup and formatting tools 2021-05-16 13:09:32 +02:00
Elias Steurer
e8fbe8e565 Add ScreenPlayUtil and ScreenPlayShader to developer docs
Update to qdoc Qt 6.1
Add module for every project
2021-05-13 13:05:05 +02:00
Elias Steurer
74aff2cea0 Add GPU Sysinfo
Update vcpkg to latest master
2021-05-12 17:09:24 +02:00
Elias Steurer
bb2363acc5 Update vcpkg
[Changelog]
Update vcpkg to the latests master (27.03.21). This will speedup
initial setup because it uses prebuild vcpkg.exe
2021-03-27 16:53:58 +01:00
Elias Steurer
da708019b0 Update vcpkg to master 25.01.2021 2021-01-25 17:04:36 +01:00
Elias Steurer
9fa317a6c5 Fix osx build script 2021-01-16 17:31:07 +01:00
Elias Steurer
4c2cb43af7 Update CI to Qt 5.15.2 2021-01-16 16:59:27 +01:00
Elias Steurer
05f9bc001e Update vcpkg to 26.12.20 2020-12-26 12:07:49 +01:00
Elias Steurer
893eec7e32 Fix linux ci compilation 2020-11-08 15:17:59 +01:00
Elias Steurer
b43769cc14 Fix osx ci not executing command in shell 2020-10-31 20:10:28 +01:00
Elias Steurer
f188e6eb1c Fix osx compilation and CI 2020-10-31 19:59:46 +01:00
Elias Steurer
2ca67739ef Fix build.py syntax 2020-10-31 19:34:42 +01:00
Elias Steurer
051a31a065 Fix casing and macos build 2020-10-31 19:32:15 +01:00
Elias Steurer
e1f75d639c Add OSX 2020-10-31 19:30:38 +01:00
Elias Steurer
612f37c45b Add install_dependencies_linux_mac to CI 2020-10-31 13:50:50 +01:00
Elias Steurer
536d2623c1 Add doctest and google benchmark 2020-10-30 15:37:00 +01:00
Elias Steurer
2311cdaccb Format file with latest python 3.9
Apparently my python 3.6 install an old cmakelang
2020-10-29 20:06:13 +01:00
Elias Steurer
f6db59f955 Add print for git diff 2020-10-29 19:52:28 +01:00
Elias Steurer
3ad6a61aa3 Fix build path
Add check if build type arg is missing
2020-10-29 19:17:45 +01:00
Elias Steurer
72a5485e7f Move vcpkg out of ScreenPlay source tree
This has some advatages. For one QtCreator starts way faster because
it queries _ALL_ files in the source dir. This can take to minute long
startup when using many packages. This makes some check python
scripts easier to write.
2020-10-29 18:52:37 +01:00
Elias Steurer
b5dae423cb Add new ci build script and check step
This is python based and is now functional for windows. We now
should be able to extend this script for linux and mac.

Move setup script to Tools folder.
2020-10-29 18:19:22 +01:00