1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Commit Graph

54 Commits

Author SHA1 Message Date
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
55b4608f69 WIP on master: bb738ca Fix qml Wallpaper and Widget setup missing qrc 2021-12-11 17:05:41 +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
1c4f7dd250 Fix none steam builds 2021-11-13 14:47:43 +01:00
Elias Steurer
97fc77ac1e Add COMPILE_INFO descriptions 2021-11-13 14:29:02 +01:00
Elias Steurer
b1abd38b28 Fix SCREENPLAY_STEAM default option order 2021-11-08 15:15:39 +01: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
3e451e33a0 Add Steam version compile flag to cpp 2021-09-19 14:34:04 +02:00
Elias Steurer
4504f06eb1 Merge branch 'master' into qt6-support
# Conflicts:
#	CMakeLists.txt
#	ScreenPlay/app.h
#	ScreenPlay/main.cpp
#	ScreenPlay/main.qml
#	ScreenPlay/qml/Navigation/Navigation.qml
#	ScreenPlay/src/settings.h
#	ScreenPlay/translations/ScreenPlay_zh_cn.qm
#	ScreenPlayWallpaper/CMakeLists.txt
#	ScreenPlayWallpaper/SPWResources.qrc
#	ScreenPlayWallpaper/qml/Wallpaper.qml
2021-09-10 11:09:38 +02:00
Elias Steurer
c8c7232f48 Fix hardcoded video path
We now use one from this git repo. Video is cc0 by
https://mantissa.xyz/pages/vj.html
2021-09-04 14:41:49 +02:00
Elias Steurer
f54cf14dc5 Fix cmake module path casing on linux 2021-08-24 17:49:38 +02:00
Elias Steurer
662a0934e9 Update translations via cmake automatically 2021-08-21 12:11:31 +02:00
Elias Steurer
cbd49b8613 Fix steam deploy options
Fix options being regular variables
Fix macos invalid time command
Add prints messages for all cmake options and defines
2021-08-16 11:00:53 +02:00
Elias Steurer
a8b4f15fea Merge remote-tracking branch 'origin/master' 2021-08-14 13:39:41 +02:00
Elias Steurer
77ed02cfc7 Add QTests for ScreenPlay 2021-08-14 13:39:36 +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
8a79576c14 Apply cmake format 2021-07-25 15:31:35 +02:00
Elias Steurer
e3a6193275 Fix macos compilation and workshop files 2021-07-25 12:26:55 +02:00
Elias Steurer
59758487b4 Fix missing QtQuickCompiler and qrc 2021-07-16 16:44:28 +02:00
Elias Steurer
fe2be3665e Make ScreenPlayWorkshop open source 2021-07-16 11:14:21 +02:00
Elias Steurer
01031ba5d8 Add qt6 support 2021-07-15 12:07:39 +02:00
Elias Steurer
b70ba77714 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ScreenPlay/CMakeLists.txt
#	ScreenPlay/app.cpp
#	ScreenPlay/main.cpp
#	ScreenPlayWallpaper/CMakeLists.txt
2021-06-25 12:31:55 +02:00
Elias Steurer
a577decdc9 Add some Qt6 cmake support
WebEngine is missing because the current 6.2 installed
has a broken WebEngine
2021-06-20 18:50:54 +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
c4812402f8 Merge 2021-05-24 14:26:06 +02:00
Elias Steurer
b0eac04ff9 Remove old files entries 2021-05-21 12:54:41 +02:00
Elias Steurer
5dcf6a83fd Add copy step 2021-03-13 16:17:56 +01:00
Elias Steurer
0e97e805d2 Merge branch 'tmp/macos' into 130-add-macos-support 2021-03-12 09:20:01 +01:00
Elias Steurer
2852659e58 Add macos fixes 2021-03-12 09:19:19 +01:00
Elias Steurer
6f62d058ec Add missing cmake option 2021-02-05 18:27:43 +01:00
Elias Steurer
5658bb9981 Fix macos compilation 2021-02-04 16:51:57 +01:00
Elias Steurer
4dcea75242 Move util functions and global enums into dedicated lib
This will make reusing easier like enum parsing between
ScreenPlay and ScreenPlayWallpaper &
project load/save
2021-01-28 15:19:46 +01:00
Elias Steurer
dd0c4b1252 Fix cmake vcpkg path 2021-01-24 16:55:13 +01:00
Elias Steurer
40b5c5472b Add LANGUAGES to CMakeLists 2021-01-03 16:54:51 +01:00
Elias Steurer
f188e6eb1c Fix osx compilation and CI 2020-10-31 19:59:46 +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
a367b222f2 Fix build paths 2020-10-29 19:47:22 +01:00
Elias Steurer
8e117cebfd Call format-cmake.py 2020-10-29 18:53:52 +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
Elias Steurer
3c314b5bda Add gold linker and add remove SysInfo for linux 2020-10-02 21:25:36 +02:00
Elias Steurer
561aa5770b Merge branch 'master' into 71-create-a-shader-library-subproject 2020-09-11 17:01:02 +02:00
Elias Steurer
1b8e708836 Replace qt-breakpad with sentry.io 2020-09-11 16:33:27 +02:00
Elias Steurer
ddad721574 Add basic shader plugin 2020-09-10 11:40:07 +02:00
Elias Steurer
81a62311aa Remove stomt
Replacing it with website, forum, bugtracker etc
2020-08-18 17:07:56 +02:00
Elias Steurer
7ed2a09656 Fix CI 2020-08-10 22:57:57 +02:00
Elias Steurer
13b7bd80fa Fix build info compile definition 2020-08-10 17:39:42 +02:00
Elias Steurer
f7a78448e5 Change compilation mode to c++ 20
Fix qml compilation in release mode
2020-06-21 16:07:41 +02:00