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

115 Commits

Author SHA1 Message Date
Elias Steurer
716397ce3a Formatting 2023-12-03 11:45:20 +01:00
Elias Steurer
3657ebb026 Fix Godot 4.2 to stable 2023-12-01 18:44:11 +01:00
Elias Steurer
dfe9e60c46 Refactor mac build to be all included into ScreenPlay.app
this also is for all tests now

Fix macos ScreenPlay.app icon
2023-11-30 09:51:12 +01:00
Elias Steurer
51294c4912 Formatting 2023-11-29 13:08:58 +01:00
Elias Steurer
b8560d6e48 Update third party dependencies 2023-11-29 10:36:58 +01:00
Elias Steurer
665f889882 Formatting 2023-11-23 13:45:24 +01:00
Elias Steurer
0185d6d952 Add proper Godot package export caching
We now have  3 versions saved in the godot
project.json.

version: Project version. Every version bump will trigger a
reexport.

We just save the major and minor version for now. Godot
does have pretty good version compability. We will need this information
later when we upgrade to newer Godot versions

godotVersionMajor
godotVersionMinor

Update to latest Godot RC1
2023-11-23 11:37:50 +01:00
Elias Steurer
0e6079fe9f Fix Godot version 2023-11-16 11:15:44 +01:00
Elias Steurer
85e8d8abc8 Fix setting version number 2023-11-16 11:15:29 +01:00
Elias Steurer
6e9f138e7e Fix macOS launch and build 2023-11-09 17:06:24 +01:00
Elias Steurer
da5bd382a8 Formatting 2023-11-09 12:57:59 +01:00
Elias Steurer
2008ff9235 Change WindowsPipeTest to only compile
when tests are enabled
2023-11-09 12:52:06 +01:00
Elias Steurer
4635643acf Fix CMAKE_OSX_ARCHITECTURES
See https://stackoverflow.com/questions/65157483/macos-build-universal-binary-2-with-cmake#comment130596963_65811061
2023-11-09 12:50:24 +01:00
Elias Steurer
55996b2914 Change cpp defines to CMakeVariables.h.in vars 2023-11-09 10:32:28 +01:00
Elias Steurer
f982002d80 Add ci support for godot
Add automatic godot and exp
2023-11-02 12:50:29 +01:00
Elias Steurer
33c222da5d Change ScreenPlayWallpaperLib to win32 only for now
Format documents
Remove sysinfo from logging for now because
it is windows only
2023-11-01 12:28:35 +01:00
Elias Steurer
ffd26f3deb Merge remote-tracking branch 'origin/master' into 174-add-godot-wallpaper-support
# Conflicts:
#	.gitignore
#	.gitlab/ci/base_jobs.yml
#	.vscode/extensions.json
#	.vscode/launch.json
#	CMakePresets.json
#	ScreenPlayWallpaper/kde/ScreenPlay/contents/ui/WaitingForScreenplay.qml
#	Tools/setup.py
2023-10-29 13:31:19 +01:00
Elias Steurer
f546c35f44 Resolve "Add Wayland layer shell support" 2023-10-29 10:26:42 +00:00
Elias Steurer
1441998435 Add working Windows pipes connection 2023-10-22 17:29:06 +02:00
Elias Steurer
8753d6b27d Fix linux compilation 2023-10-13 13:08:09 +02:00
Elias Steurer
8223eb5c36 Add Godot export
Fix paths in sidebar now that we have multiple
storage paths
Add Godot wallpaper and edit to ScreenPlay
Fix showing Godot icon in task bar
2023-09-28 15:55:11 +02:00
Elias Steurer
7ecbd2e8d1 Add default Godot project with GDExtension
Add Godot Editor download
Add Godot Editor start in launch.json
2023-08-31 14:53:59 +02:00
Elias Steurer
410920df9c Fix CMake build for universal x86 2023-08-27 09:38:19 +02:00
Elias Steurer
fdbf077f0e WIP: Add mac .dmg installer
This does not yet work with signing of the
macos .dmg
ScreenPlay-Installer.dmg:
rejected (the code is valid but does not seem to be an app)
2023-08-24 16:02:43 +02:00
Elias Steurer
58567987aa Remove ScreePlay version from defines.py
We now use always the latest set git tag as version.
This means we also no longer need to add it as an argument
2023-08-17 14:26:39 +02:00
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