mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-10-06 09:17:07 +02:00
Update third party dependencies
This commit is contained in:
parent
780fa8f60b
commit
b8560d6e48
@ -35,7 +35,7 @@
|
|||||||
- cd ..
|
- cd ..
|
||||||
- git clone https://invent.kde.org/plasma/layer-shell-qt.git
|
- git clone https://invent.kde.org/plasma/layer-shell-qt.git
|
||||||
- cd layer-shell-qt
|
- cd layer-shell-qt
|
||||||
- cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.6.0/gcc_64"
|
- cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.6.1/gcc_64"
|
||||||
- make
|
- make
|
||||||
- make install
|
- make install
|
||||||
- cd ..
|
- cd ..
|
||||||
|
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@ -17,7 +17,7 @@
|
|||||||
"environment": [
|
"environment": [
|
||||||
{
|
{
|
||||||
"name": "Path",
|
"name": "Path",
|
||||||
"value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.6.0\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.6.0\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.6.0\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
|
"value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.6.1\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.6.1\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.6.1\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"visualizerFile": "${workspaceFolder}/.vscode/qt.natvis.xml"
|
"visualizerFile": "${workspaceFolder}/.vscode/qt.natvis.xml"
|
||||||
|
@ -43,9 +43,11 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
|
|||||||
# This subdirectoy is needed for OSX and Linux to fix linker errors because we would have ScreenPlayApp executable and folder for the qml
|
# This subdirectoy is needed for OSX and Linux to fix linker errors because we would have ScreenPlayApp executable and folder for the qml
|
||||||
# files in the same directory.
|
# files in the same directory.
|
||||||
set(SCREENPLAY_QML_MODULES_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qml")
|
set(SCREENPLAY_QML_MODULES_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qml")
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(SCREENPLAY_QML_MODULES_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ScreenPlay.app/Contents/MacOS/qml")
|
set(SCREENPLAY_QML_MODULES_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ScreenPlay.app/Contents/MacOS/qml")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Adds the qml import path so QtCreator can find them
|
# Adds the qml import path so QtCreator can find them
|
||||||
list(APPEND QML_DIRS "${SCREENPLAY_QML_MODULES_PATH}")
|
list(APPEND QML_DIRS "${SCREENPLAY_QML_MODULES_PATH}")
|
||||||
set(QML_IMPORT_PATH
|
set(QML_IMPORT_PATH
|
||||||
@ -60,8 +62,8 @@ set(VCPKG_BIN_PATH "${VCPKG_INSTALLED_PATH}/bin")
|
|||||||
set(GODOT_VERSION_MAJOR "4")
|
set(GODOT_VERSION_MAJOR "4")
|
||||||
set(GODOT_VERSION_MINOR "2")
|
set(GODOT_VERSION_MINOR "2")
|
||||||
set(GODOT_VERSION_PATCH "")
|
set(GODOT_VERSION_PATCH "")
|
||||||
|
set(GODOT_RELEASE_TYPE "rc2")
|
||||||
|
|
||||||
set(GODOT_RELEASE_TYPE "rc1")
|
|
||||||
# Use an if statement to check if GODOT_VERSION_PATCH is empty or not
|
# Use an if statement to check if GODOT_VERSION_PATCH is empty or not
|
||||||
if(GODOT_VERSION_PATCH STREQUAL "")
|
if(GODOT_VERSION_PATCH STREQUAL "")
|
||||||
# If patch version is empty, don't include it and the preceding dot
|
# If patch version is empty, don't include it and the preceding dot
|
||||||
@ -84,7 +86,7 @@ endif()
|
|||||||
option(SCREENPLAY_OSX_BUNDLE "Enable distribution macOS bundle" OFF)
|
option(SCREENPLAY_OSX_BUNDLE "Enable distribution macOS bundle" OFF)
|
||||||
option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON)
|
option(SCREENPLAY_STEAM "For FOSS distribution so we do not bundle proprietary code." ON)
|
||||||
option(SCREENPLAY_DEPLOY "Marks this version as an official deploy version. This version uses different import paths and other settings."
|
option(SCREENPLAY_DEPLOY "Marks this version as an official deploy version. This version uses different import paths and other settings."
|
||||||
OFF)
|
OFF)
|
||||||
option(SCREENPLAY_TESTS "Enables UI tests." ON)
|
option(SCREENPLAY_TESTS "Enables UI tests." ON)
|
||||||
option(SCREENPLAY_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF)
|
option(SCREENPLAY_INSTALLER "Indicates whether an installer via the Qt Installer Framework is created." OFF)
|
||||||
option(SCREENPLAY_GODOT "Compiles ScreenPlayGodotWallpaper." ON)
|
option(SCREENPLAY_GODOT "Compiles ScreenPlayGodotWallpaper." ON)
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
},
|
},
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_path": "${sourceDir}/../aqt",
|
"qt_path": "${sourceDir}/../aqt",
|
||||||
"qt_version": "6.6.0"
|
"qt_version": "6.6.1"
|
||||||
},
|
},
|
||||||
"toolset": {
|
"toolset": {
|
||||||
"value": "host=x64",
|
"value": "host=x64",
|
||||||
@ -38,46 +38,46 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "windows-debug-qt-6.6.0",
|
"name": "windows-debug-qt-6.6.1",
|
||||||
"inherits": "default-windows",
|
"inherits": "default-windows",
|
||||||
"displayName": "MSVC SP Qt 6.6.0 Debug",
|
"displayName": "MSVC SP Qt 6.6.1 Debug",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Debug",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_MSVC_Debug",
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_version": "6.6.0"
|
"qt_version": "6.6.1"
|
||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug"
|
"CMAKE_BUILD_TYPE": "Debug"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "windows-relwithdebinfo-qt-6.6.0",
|
"name": "windows-relwithdebinfo-qt-6.6.1",
|
||||||
"inherits": "default-windows",
|
"inherits": "default-windows",
|
||||||
"displayName": "MSVC SP Qt 6.6.0 RelWithDebInfo",
|
"displayName": "MSVC SP Qt 6.6.1 RelWithDebInfo",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_RelWithDebInfo",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_MSVC_RelWithDebInfo",
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_version": "6.6.0"
|
"qt_version": "6.6.1"
|
||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "windows-release-qt-6.6.0",
|
"name": "windows-release-qt-6.6.1",
|
||||||
"inherits": "default-windows",
|
"inherits": "default-windows",
|
||||||
"displayName": "MSVC SP Qt 6.6.0 Release",
|
"displayName": "MSVC SP Qt 6.6.1 Release",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Release",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_MSVC_Release",
|
||||||
"environment": {
|
"environment": {
|
||||||
"qt_version": "6.6.0"
|
"qt_version": "6.6.1"
|
||||||
},
|
},
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Release"
|
"CMAKE_BUILD_TYPE": "Release"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "windows-release-qt-6.6.0-release-deploy",
|
"name": "windows-release-qt-6.6.1-release-deploy",
|
||||||
"inherits": "windows-release-qt-6.6.0",
|
"inherits": "windows-release-qt-6.6.1",
|
||||||
"displayName": "MSVC SP Qt 6.6.0 Release Steam Deploy",
|
"displayName": "MSVC SP Qt 6.6.1 Release Steam Deploy",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Release_Steam_Deploy",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_MSVC_Release_Steam_Deploy",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Release",
|
"CMAKE_BUILD_TYPE": "Release",
|
||||||
"SCREENPLAY_DEPLOY": "ON",
|
"SCREENPLAY_DEPLOY": "ON",
|
||||||
@ -89,7 +89,7 @@
|
|||||||
"displayName": "ScreenPlay 64bit Debug Linux",
|
"displayName": "ScreenPlay 64bit Debug Linux",
|
||||||
"description": "Linux only!",
|
"description": "Linux only!",
|
||||||
"generator": "Ninja",
|
"generator": "Ninja",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_Debug",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_GCC_Debug",
|
||||||
"condition": {
|
"condition": {
|
||||||
"type": "equals",
|
"type": "equals",
|
||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
@ -113,7 +113,7 @@
|
|||||||
"name": "linux-relwithdebinfo",
|
"name": "linux-relwithdebinfo",
|
||||||
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
|
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
|
||||||
"inherits": "linux-generic-debug",
|
"inherits": "linux-generic-debug",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_RelWithDebInfo",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_GCC_RelWithDebInfo",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
@ -123,7 +123,7 @@
|
|||||||
"displayName": "ScreenPlay 64bit Debug Linux using aqt",
|
"displayName": "ScreenPlay 64bit Debug Linux using aqt",
|
||||||
"description": "Linux only!",
|
"description": "Linux only!",
|
||||||
"generator": "Ninja",
|
"generator": "Ninja",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_Debug",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_GCC_Debug",
|
||||||
"condition": {
|
"condition": {
|
||||||
"type": "equals",
|
"type": "equals",
|
||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
@ -140,7 +140,7 @@
|
|||||||
"CMAKE_CXX_COMPILER": "g++",
|
"CMAKE_CXX_COMPILER": "g++",
|
||||||
"CMAKE_C_COMPILER": "gcc",
|
"CMAKE_C_COMPILER": "gcc",
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.0/gcc_64",
|
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.1/gcc_64",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
"VCPKG_TARGET_TRIPLET": "x64-linux"
|
"VCPKG_TARGET_TRIPLET": "x64-linux"
|
||||||
}
|
}
|
||||||
@ -149,7 +149,7 @@
|
|||||||
"name": "linux-aqt-relwithdebinfo",
|
"name": "linux-aqt-relwithdebinfo",
|
||||||
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux using aqt",
|
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux using aqt",
|
||||||
"inherits": "linux-ubuntu-debug",
|
"inherits": "linux-ubuntu-debug",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_RelWithDebInfo",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_GCC_RelWithDebInfo",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
@ -159,7 +159,7 @@
|
|||||||
"displayName": "ScreenPlay 64bit Debug osx",
|
"displayName": "ScreenPlay 64bit Debug osx",
|
||||||
"description": "Osx only!",
|
"description": "Osx only!",
|
||||||
"generator": "Ninja",
|
"generator": "Ninja",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_Clang_Debug",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_Clang_Debug",
|
||||||
"condition": {
|
"condition": {
|
||||||
"type": "equals",
|
"type": "equals",
|
||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
@ -174,7 +174,7 @@
|
|||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"CMAKE_C_COMPILER": "clang",
|
"CMAKE_C_COMPILER": "clang",
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.0/macos",
|
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.1/macos",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -182,7 +182,7 @@
|
|||||||
"name": "osx-relwithdebinfo",
|
"name": "osx-relwithdebinfo",
|
||||||
"displayName": "ScreenPlay 64bit RelWithDebInfo osx",
|
"displayName": "ScreenPlay 64bit RelWithDebInfo osx",
|
||||||
"inherits": "osx-debug",
|
"inherits": "osx-debug",
|
||||||
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_Clang_RelWithDebInfo",
|
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.1_Clang_RelWithDebInfo",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
}
|
}
|
||||||
@ -207,7 +207,7 @@
|
|||||||
"name": "Test",
|
"name": "Test",
|
||||||
"description": "",
|
"description": "",
|
||||||
"displayName": "",
|
"displayName": "",
|
||||||
"configurePreset": "windows-release-qt-6.6.0"
|
"configurePreset": "windows-release-qt-6.6.1"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
2
ThirdParty/CMakeLists.txt
vendored
2
ThirdParty/CMakeLists.txt
vendored
@ -11,7 +11,7 @@ FetchContent_Populate(
|
|||||||
FetchContent_Populate(
|
FetchContent_Populate(
|
||||||
qml-plausible
|
qml-plausible
|
||||||
GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
|
GIT_REPOSITORY https://gitlab.com/kelteseth/qml-plausible.git
|
||||||
GIT_TAG 5069ba3bf25663ea06be8b94c398d6c61058d4d5
|
GIT_TAG 322d8e17cab77b496f0d7fafb19f6dcda4193ed7
|
||||||
# Workaround because: 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
|
# Workaround because: 1. QtCreator cannot handle QML_ELEMENT stuff when it is in bin folder
|
||||||
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
# https://bugreports.qt.io/browse/QTCREATORBUG-27083
|
||||||
SOURCE_DIR ${THIRD_PARTY_PATH}/qml-plausible)
|
SOURCE_DIR ${THIRD_PARTY_PATH}/qml-plausible)
|
||||||
|
@ -12,7 +12,7 @@ import argparse
|
|||||||
def main():
|
def main():
|
||||||
# Parse build folder as arugment
|
# Parse build folder as arugment
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.6.0_MSVC_Debug/bin')
|
parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.6.1_MSVC_Debug/bin')
|
||||||
parser.add_argument('--build_path', dest="build_path", type=str, help='Build folder')
|
parser.add_argument('--build_path', dest="build_path", type=str, help='Build folder')
|
||||||
parser.add_argument('--skip_if_exists', dest="skip_if_exists", default=False, action="store_true", help='Skips the build if the index.html file exists. This is used for faster CMake configure')
|
parser.add_argument('--skip_if_exists', dest="skip_if_exists", default=False, action="store_true", help='Skips the build if the index.html file exists. This is used for faster CMake configure')
|
||||||
|
|
||||||
@ -20,7 +20,7 @@ def main():
|
|||||||
|
|
||||||
if not args.build_path:
|
if not args.build_path:
|
||||||
print("ERROR: Please specify the build folder")
|
print("ERROR: Please specify the build folder")
|
||||||
print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.6.0_MSVC_Debug/bin/")
|
print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.6.1_MSVC_Debug/bin/")
|
||||||
exit()
|
exit()
|
||||||
|
|
||||||
# if build path exists and contains a index.html file, skip the build
|
# if build path exists and contains a index.html file, skip the build
|
||||||
|
@ -21,12 +21,12 @@ elif sys.platform == "linux":
|
|||||||
REPO_PATH = Path(__file__, "../../").resolve()
|
REPO_PATH = Path(__file__, "../../").resolve()
|
||||||
THIRDPATH_PATH = Path(REPO_PATH, "ThirdParty").resolve()
|
THIRDPATH_PATH = Path(REPO_PATH, "ThirdParty").resolve()
|
||||||
QT_PATH = path = Path(REPO_PATH, "../aqt").resolve()
|
QT_PATH = path = Path(REPO_PATH, "../aqt").resolve()
|
||||||
QT_VERSION = "6.6.0"
|
QT_VERSION = "6.6.1"
|
||||||
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
|
QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
|
||||||
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
|
QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
|
||||||
QT_IFW_VERSION = "4.6"
|
QT_IFW_VERSION = "4.6"
|
||||||
# 25.11.2023 https://gitlab.com/kelteseth/screenplay-vcpkg :
|
# 25.11.2023 https://gitlab.com/kelteseth/screenplay-vcpkg :
|
||||||
VCPKG_VERSION = "cd5e746ec203c8c3c61647e0886a8df8c1e78e41"
|
VCPKG_VERSION = "cabba0d0379b78e34d0a0d37edb4c459c5a03337"
|
||||||
VCPKG_BASE_PACKAGES = [
|
VCPKG_BASE_PACKAGES = [
|
||||||
"curl",
|
"curl",
|
||||||
"openssl",
|
"openssl",
|
||||||
@ -38,7 +38,7 @@ VCPKG_BASE_PACKAGES = [
|
|||||||
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
|
PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
|
||||||
FFMPEG_VERSION = "6.0"
|
FFMPEG_VERSION = "6.0"
|
||||||
GODOT_VERSION = "4.2"
|
GODOT_VERSION = "4.2"
|
||||||
GODOT_RELEASE_TYPE = "rc1"
|
GODOT_RELEASE_TYPE = "rc2"
|
||||||
GODOT_DOWNLOAD_SERVER = "https://github.com/godotengine/godot-builds/releases/download"
|
GODOT_DOWNLOAD_SERVER = "https://github.com/godotengine/godot-builds/releases/download"
|
||||||
if sys.platform == "win32":
|
if sys.platform == "win32":
|
||||||
SCREENPLAYWALLPAPER_GODOT_EXECUTABLE = "ScreenPlayWallpaperGodot.exe"
|
SCREENPLAYWALLPAPER_GODOT_EXECUTABLE = "ScreenPlayWallpaperGodot.exe"
|
||||||
|
@ -55,9 +55,9 @@ def download(aqt_path: Path, qt_platform: Path):
|
|||||||
qt_packages = "qtwaylandcompositor "
|
qt_packages = "qtwaylandcompositor "
|
||||||
os = "linux"
|
os = "linux"
|
||||||
|
|
||||||
# Windows: python -m aqt list-qt windows desktop --modules 6.6.0 win64_msvc2019_64
|
|
||||||
# Linux: python3 -m aqt list-qt linux desktop --modules 6.6.0 gcc_64
|
|
||||||
qt_packages += "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
|
qt_packages += "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
|
||||||
|
# Windows: python -m aqt list-qt windows desktop --modules 6.6.1 win64_msvc2019_64
|
||||||
|
# Linux: python3 -m aqt list-qt linux desktop --modules 6.6.1 gcc_64
|
||||||
print(f"Downloading: {qt_packages} to {aqt_path}")
|
print(f"Downloading: {qt_packages} to {aqt_path}")
|
||||||
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")
|
execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user