Elias Steurer
797b4e205c
Fix qt version
2021-11-13 14:30:55 +01: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
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
41f66a236a
Fix incorrect qmldir for mac deploy
2021-08-21 14:09: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
6ea784ffed
Fix explicit steam workshop build for build.py
2021-08-16 11:22:25 +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
2d04ce2608
Add macOS code signing
2021-08-08 19:31:50 +02:00
Elias Steurer
e3a6193275
Fix macos compilation and workshop files
2021-07-25 12:26:55 +02:00
Elias Steurer
5164a7b916
Change CI to use setup.py
2021-05-16 13:12:24 +02: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
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
3ad6a61aa3
Fix build path
...
Add check if build type arg is missing
2020-10-29 19:17:45 +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
