1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-02 00:29:48 +02:00
Commit Graph

90 Commits

Author SHA1 Message Date
Elias Steurer
efc70e9fc0 Change CI to split into multile sections
Change version to be only set via git tags
2023-08-11 17:00:24 +02:00
Elias Steurer
73f31d2092 Update IFW version 2023-06-11 10:38:52 +02:00
Elias Steurer
287730e9c7 Change macos building fat universal binary as default
For this we now use a custom triplet. This has some drawbacks like openssl
does not work with this config. Luckily we can
use openssl that is provided by Qt. On macOS
they use Secure Transport.
2023-06-02 09:51:56 +02:00
Elias Steurer
75d72de5b7 Update min CMake version to 3.26 (and QtCreator 10)
This will allow us to remove all of the hardcoded paths
2023-03-30 17:49:02 +02:00
Elias Steurer
1b65e2ae18 Fix build date command on osx 2023-02-25 11:13:10 +01:00
Elias Steurer
e96b3fd35b Remove Common folder in favor of ThirdParty 2023-02-18 12:11:29 +01:00
Elias Steurer
6e2cecddb3 Fix compilation and signing
Move TrayIcon back to ScreenPlay:
- This fixes the missing labs plugins when running the macdeployqt script
- We don't need it here only in the SP main folder anyway

Move building and sign of the osx version for x64 and arm64 into the
actual build script.

Remove the qml plugin path workaround from the addImportPath
2023-02-11 11:57:09 +01:00
Elias Steurer
8b10e5989f Add basic .dmg bundle support 2023-02-09 16:35:08 +01:00
Elias Steurer
b5aa584337 Remove Qt Maintenance tool requirement 2022-12-16 13:34:15 +01:00
Elias Steurer
07ffd812b1 Remove hardcoded IFW version 2022-11-11 13:09:16 +01:00
Elias Steurer
dbb79cef41 Formatting cmake 2022-11-02 11:37:01 +01:00
Elias Steurer
cd5933a7e4 Refactor CI to only include what we currently use
Refactor osx build with universal binary support
Rename release to deploy version to make it less confusing
2022-08-14 11:58:41 +02:00
Elias Steurer
fa1c1afd71 Update to ifw 4.4 2022-07-21 14:25:25 +02:00
Elias Steurer
29ca12fc6e Merge remote-tracking branch 'origin/master' 2022-07-15 13:08:23 +02:00
Elias Steurer
4db3591c66 Add explicit x86_64 and arm64 build option for mac
VCPKG cannot compile two architectures at once.
We still need to combine the created Apps into a fat binary.
2022-07-15 12:43:57 +02:00
Elias Steurer
9419242bcb Add explicit openssl dll copy 2022-07-09 19:54:54 +02:00
Elias Steurer
96b448237c Restore build info feature 2022-07-09 18:24:14 +02:00
Elias Steurer
b00ad322ab Move Apple universal build CMake flag up 2022-07-08 13:31:51 +02:00
Elias Steurer
7773bdb148 Merge remote-tracking branch 'origin/master' 2022-07-08 12:50:37 +02:00
Elias Steurer
bf199ab001 Add explicit SCREENPLAY_RELEASE option
For now this disables setting autostart path on
dev builds. This is annoying because it previously
did set the path to the ScreenPlay dev build that
did have all the dlls and thus fails.
2022-07-08 12:49:53 +02:00
Elias Steurer
a5ca4c7796 Add explicit arm64-osx support to the build script
Add not yet used download_qt.py
2022-07-08 12:33:26 +02:00
Elias Steurer
4da09711e6 Merge remote-tracking branch 'origin/HEAD' 2022-05-12 14:36:18 +02:00
Elias Steurer
bf2aa2d1fa Add osx universal builds 2022-05-06 17:23:14 +02:00
Elias Steurer
a366fcc56a Add .screenplay project export import via QArchive 2022-05-06 14:51:56 +02:00
Elias Steurer
484204de5f Add QML_DIRS to cmake to make QtCreator recognize our new qml subdir 2022-05-05 13:01:30 +02:00
Elias Steurer
58f30ee2c8 Fix ifw hardcoded version number 4.2 that is
no longer available when installing via aqt
2022-04-30 14:18:02 +02:00
Elias Steurer
844a4ab676 Remove all .qrc files . We now use qt_add_qml_module
Copy fonts manually now
Fix paths
2022-04-30 13:22:17 +02:00
Elias Steurer
12b6911635 Merge and adapt change to make it runnable on linux
Move all qml components into a dedicated qml subfolder.  This was needed to fix linker
errors where we would have a folder that has the same name as our executable.
2022-04-30 12:07:54 +02:00
Elias Steurer
41967b541c Fix none steam builds and installer
Refactor Navigation to use Qt style navigation
2022-04-23 19:26:55 +02:00
Elias Steurer
5d1c941cb3 Formatting 2022-04-04 18:09:45 +02:00
Elias Steurer
77a81451ca Multiple refactoring....
Bump Qt to 6.3 to fix video loop
Remove no longer working shader and add new
WIP: Shader compilation path is wrong for some reason
Add Steamless version content path
Remove cmake-format: sortable from CMakeLists.txt
Add Widnow scale indocator icon to the bottom right
Remove unused doctest and benchmark
Fix tests and installer cmake logic
2022-04-04 18:06:43 +02:00
Elias Steurer
fb5d6581ec Change all plugins to be QML_ELEMENT
Add ScreenPlayWeather
2022-02-20 17:55:26 +01:00
Elias Steurer
1d81117f6e Change ci to also use aqt install for IFW 2022-02-10 15:04:52 +01:00
Elias Steurer
a1fe840e54 Fix IFW path on linux ci 2022-01-29 12:24:26 +01:00
Elias Steurer
b24986b1ba Fix linux installer creation 2022-01-27 18:18:49 +01:00
Elias Steurer
e55182cdaf Add some basic working in installer with cmake 3.23 2022-01-27 14:54:45 +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
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