Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00
Code Issues Projects Releases Activity
2,851 Commits 19 Branches 35 Tags 192 MiB
db08b38f27
Commit Graph

235 Commits

Author SHA1 Message Date
Elias Steurer
72a3ffba76 Fix macOS paths and remove old lipo script 2023-06-02 18:51:20 +02:00
Elias Steurer
dfd311c5d5 Merge commit 'e85c5ac6b69f38976521f9fd842f5b5a47c08cc9' 
# Conflicts:
#	Tools/defines.py
 2023-06-02 13:25:42 +02:00
Elias Steurer
ac00f94dc5 Remove old download script and fix openssl on win 2023-06-02 10:19:47 +02:00
Elias Steurer
11905a6370 Cleanup and small fixes 2023-06-02 10:19:12 +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
9b8b8e0374 Update to Qt 6.5.1 
This removed the QWebEngine workaround and fixes ffmpeg looping,
but introduces ffmpeg crash.
 2023-05-25 15:14:16 +02:00
Elias Steurer
e85c5ac6b6 WIP on master: 844215db Update steamSDK to 1.56 2023-04-21 11:13:30 +02:00
Elias Steurer
844215db5e Update steamSDK to 1.56 2023-04-06 12:08:04 +02:00
Elias Steurer
e96b3fd35b Remove Common folder in favor of ThirdParty 2023-02-18 12:11:29 +01:00
Elias Steurer
df216ec42d Bump to 0.15.0-RC6 2023-02-16 13:19:21 +01:00
Elias Steurer
db9d319388 Add Qt 6.5 looping workaround 
Remove Qt6Widgets workaround

Update to latest vcpkg
Update to latest plausible-qml
Update to latest QArchive
 2023-02-16 13:06:50 +01:00
Elias Steurer
ef8b31c18b Fix resetting the cmake_osx_architectures 2023-02-11 15:17:50 +01:00
Elias Steurer
858e72e066 Default to x64 for first build on osx 2023-02-11 14:12:44 +01:00
Elias Steurer
5abaf85b3f Remove seperate signing step and put it into the build step 
Fix qt path
 2023-02-11 13:53:44 +01:00
Elias Steurer
06b7306173 Fix missing triplet and architecture 2023-02-11 13:23:32 +01:00
Elias Steurer
515e57d280 Remove workaround 2023-02-11 13:10:54 +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
c9556f08d2 Remove outdated comment 2023-02-09 11:53:20 +01:00
Elias Steurer
fab7d0f4c3 Add docs 2023-02-09 11:52:12 +01:00
Elias Steurer
19ce4ce823 Fix sign script 2023-02-04 17:53:57 +01:00
Elias Steurer
abddca8685 Remove seperate .app for wallpaper and widgets 2023-02-04 17:34:59 +01:00
Elias Steurer
d07d26eefb Add deploy workaround for QTBUG-110937 2023-02-04 16:00:57 +01:00
Elias Steurer
6de0f7f167 Fix publish scipt not removing quotes 2023-02-04 14:06:48 +01:00
Elias Steurer
cbf8978c68 Add SPDX license 2023-02-04 11:56:23 +01:00
Elias Steurer
6501a4c79f Add automatic moc include for faster compile times 2023-02-04 11:42:32 +01:00
Elias Steurer
6f5fabeb0e Add qtconnectivity to fix windeploqt and macdeployqt 
For some reason scene2d.dll need Qt6Bluetooth. What even is scene2d?
 2023-02-03 10:16:39 +01:00
Elias Steurer
17347f324e Remove update translations from CMake to python script 2023-02-02 15:34:09 +01:00
Elias Steurer
f9bc5c7112 Fix ffmpeg setup deleting wrong file 2023-01-29 14:07:09 +01:00
Elias Steurer
31005092be Bump version to 0.15.0-RC5 2023-01-29 13:26:36 +01:00
Elias Steurer
9b97d81e39 Bump to 6.5 on all platforms 2023-01-29 13:03:03 +01:00
Elias Steurer
64cde196eb Update qdoc and formatting 
turns out we need the Q_PROPERTY setter
in the cpp file for qdoc to recognize it
 2023-01-28 11:02:10 +01:00
Elias Steurer
4dab506b41 Fix linux compilation 
- Downgrade to stable Qt for now, because linux mirrors are not yet updated
- Launch.json linux "type": "lldb" does not work for some reason...
 2023-01-27 10:04:51 +01:00
Elias Steurer
64d2c3adb5 Bump to Qt 6.5.0 and use FFMPEG 
FFMPEG will become default in 6.6.0 anyways
and this fixes the broken rendering on osx and performs
better on my AMD Vega VII on Windows
 2023-01-27 09:01:37 +01:00
Elias Steurer
97b05c5ff9 Refactor qml format script 
Lets not add the changes now, but later, because this
was a flyby work.
 2023-01-22 16:29:20 +01:00
Elias Steurer
7871573179 Update to use SPDX-License-Identifier 2023-01-19 10:33:49 +01:00
Elias Steurer
9951faf137 Bump ScreenPlay version 2023-01-07 12:47:15 +01:00
Elias Steurer
8b831ac9c8 Bump to Qt 6.4.2 
Fix qt paths still using Qt Maintenance
 2023-01-07 12:30:18 +01:00
Elias Steurer
04c86508ef Remove Qt Maintanance build in favor of aqt 
Update osx steam contentbuilder bins
Add skip build option
 2023-01-05 13:42:58 +01:00
Elias Steurer
e0e02cfcde Fix macOS qt 6.4.1 broken QWebEngine 
Lets use 6.3.2 for now until
https://bugreports.qt.io/browse/QTBUG-96406
is fixed
 2022-12-17 13:29:31 +01:00
Elias Steurer
3042de6d3b Change aqt download dir to be the same as vcpkg 
This removes the inconsistency and bundles all dependencies
in one folder.
 2022-12-17 12:52:00 +01:00
Elias Steurer
a62be6884f Add missing python dependencies call 2022-12-16 13:41:17 +01:00
Elias Steurer
b5aa584337 Remove Qt Maintenance tool requirement 2022-12-16 13:34:15 +01:00
Elias Steurer
4da1f5cd04 Bump qt version to 6.4.1 2022-11-19 16:32:37 +01:00
Elias Steurer
6a41642bfe Fix date format and missing chmod for steamcmd 2022-11-12 17:09:51 +01:00
Elias Steurer
7a6af59621 Fix macOS qt path not using compiler name 2022-11-12 14:12:34 +01:00
Elias Steurer
07ffd812b1 Remove hardcoded IFW version 2022-11-11 13:09:16 +01:00
Elias Steurer
4f9fa3e266 Bump IFW and vcpkg 2022-11-11 12:19:13 +01:00
Elias Steurer
c32889166b Remove tmp files 2022-11-11 12:19:02 +01:00
Elias Steurer
ce8ace41ea Bump choco scripts version 
Change build script to first build none steam version
then publish to kelteseth.com. Follow with regular steam build
 2022-11-04 16:32:53 +01:00
Elias Steurer
04e34f9358 Add newline to cmake arguments 2022-11-04 16:31:26 +01:00
Elias Steurer
33592b5f0d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Tools/build_and_publish.py
 2022-11-02 16:41:55 +01:00
Elias Steurer
cde02c28e7 Add build_and_publish window script none steam version 
Now:
1. Build steamless version
2. Upload to FTP
3. Build Steam version
4. Upload to Steam
 2022-11-02 16:41:06 +01:00
Elias Steurer
6e78909060 Merge remote-tracking branch 'origin/master' 2022-11-02 16:39:57 +01:00
Elias Steurer
85aad49a29 Add skip publish step 
Change osx base to x64. This no longer crashes the
app and x64 and it still works for arm...
 2022-11-02 16:39:23 +01:00
Elias Steurer
aeae7ce07e Fix zip containing paths 2022-11-02 16:29:35 +01:00
Elias Steurer
01c458a5f5 Fix variable 2022-11-02 13:28:54 +01:00
Elias Steurer
6e320c0b50 Revert QArchive update 
this caused compilation errors for time

Add duration prints to build.py
 2022-11-02 12:56:34 +01:00
Elias Steurer
00c051da9a Update python to output utf-8 2022-11-02 12:15:34 +01:00
Elias Steurer
becfe4bf57 Fix missing indirect QWebEngine dependency 2022-10-14 12:35:59 +02:00
Elias Steurer
0acab25bde Fix aqt path on osx 2022-10-14 11:54:00 +02:00
Elias Steurer
02b2d0f354 Fix aqt install command for linux and osx 2022-10-14 11:38:14 +02:00
Elias Steurer
5df7c39259 Fix python command 
Fix remove outdated order
 2022-10-14 11:30:26 +02:00
Elias Steurer
bda6716d3a Refactor build &ci script to use aqt 
Refactor gitlab-ci to inherit base
Add defines.py that stores variables like versions
Bump Qt version to 6.3.2
 2022-10-10 11:35:41 +02:00
Elias Steurer
ab247040f9 Update choco hash 2022-08-27 17:50:59 +02:00
Elias Steurer
30b759953a Merge remote-tracking branch 'origin/master' 2022-08-26 15:48:48 +02:00
Elias Steurer
73078edee6 Fix macOS universal signing 2022-08-26 15:45:49 +02:00
Elias Steurer
3e283aa5d5 Update SteamSDK to 1.55 
Add ContentBuilder tools
 2022-08-26 15:43:50 +02:00
Elias Steurer
a59de4a8e2 Fix not called lipo 2022-08-14 12:27:05 +02:00
Elias Steurer
b0705fe47a Fix osx lipo call 2022-08-14 12:24:02 +02: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
472e341440 Fix to only zip installer if we have one 2022-08-07 18:20:16 +02:00
Elias Steurer
8ca09c684d Add automatic build uploads to kelteseth.com 
Add choco build and docs for pushing
 2022-08-07 12:24:07 +02:00
Elias Steurer
81944e7148 Add basic chocolatey support 2022-08-06 14:24:00 +02:00
Elias Steurer
773ef8317b Remove linux deploy command 
linuxdeploqt is awful and we simply copy
everything from qt
 2022-07-29 16:08:25 +02:00
Elias Steurer
c96263eb1d Add missing screenplay_version 2022-07-29 15:34:01 +02:00
Elias Steurer
46dd20a796 Fix function with the same name as a parameter 
Fix missing executable_file_ending
 2022-07-29 15:24:45 +02:00
Elias Steurer
671866de60 Fix missing aqt option 2022-07-29 14:56:45 +02:00
Elias Steurer
f5bb79d160 Rewrite of build.py to use classes and functions 
2 classes that old the data that later will be
used for the ftp upload and other tools
 2022-07-24 17:56:00 +02:00
Elias Steurer
717a182af8 Fix cmake argument 
x64 argument by vcpkg is
x86_64 in cmake...

Update to Qt 6.3.1
 2022-07-22 14:18:04 +02:00
Elias Steurer
962f3ea4cd Fix setup script 2022-07-22 13:35:23 +02:00
Elias Steurer
a8cad9eb76 Merge remote-tracking branch 'origin/master' 2022-07-22 13:35:08 +02:00
Elias Steurer
3a917c18c4 Update macos build scripts 2022-07-22 13:21:30 +02:00
Elias Steurer
cda5aeeb85 Add automatic requirements installation 2022-07-22 12:31:52 +02:00
Elias Steurer
4f27231311 Add python Windows ffmpeg downloads 2022-07-21 14:21:52 +02:00
Elias Steurer
e2e1a05347 Revert to bat file 
this works always, the ps1 script stopped working
for some reason....
 2022-07-15 13:11:09 +02:00
Elias Steurer
29ca12fc6e Merge remote-tracking branch 'origin/master' 2022-07-15 13:08:23 +02:00
Elias Steurer
37c8918683 Update to latest vcpkg and ffmpeg 5.0.1 
Remove old download_ffmpeg.bat
 2022-07-15 13:08:17 +02:00
Elias Steurer
376e96f96c Add macos folder copy for qml folder 2022-07-15 13:05:47 +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
82beeaeb05 Revert to Qt 6.3.1 
6.4 crashes on some videos
 2022-07-09 19:51:57 +02:00
Elias Steurer
1f80ba90ca Refactor build and publish scripts 
Add mac arm support
Refactor build and publish build build
 2022-07-09 13:05:42 +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
169b00091b Fix installer argument 2022-05-20 15:52:32 +02:00
Elias Steurer
b900f5c0ae Add Scoop recipe 2022-05-20 13:23:39 +02:00
Elias Steurer
e00b5f1ebe Fix steam dylib paths 2022-05-12 14:55:58 +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