Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity

Merge commit 'e85c5ac6b69f38976521f9fd842f5b5a47c08cc9'

Browse Source 
# Conflicts:
#	Tools/defines.py
This commit is contained in:
Elias Steurer 2023-06-02 13:25:42 +02:00
commit dfd311c5d5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ScreenPlay/CMakeLists.txt
View File

@ -251,7 +251,6 @@ if(WIN32)
# CURL must be included before sentry because sentry needs the module and does not include it itself on macos...
find_package(CURL CONFIG REQUIRED)
find_package(sentry CONFIG REQUIRED)
find_package(OpenSSL CONFIG REQUIRED)
endif()
find_package(

11
Tools/build.py
View File

@ -298,10 +298,17 @@ def package(build_config: BuildConfig):
if platform.system() == "Windows":
vcpkg_bin_path = Path(
f"{build_config.root_path}/../vcpkg/installed/x64-windows/bin").resolve()
print(f"Copy dlls from vcpkg bin path: {vcpkg_bin_path}")
for file in vcpkg_bin_path.iterdir():
if file.suffix == ".dll" and file.is_file():
print(file, build_config.bin_dir)
print("Copy: ", file, build_config.bin_dir)
shutil.copy2(file, build_config.bin_dir)
# Use Qt OpenSSLv3
openSLL_path = Path(
f"{defines.QT_PATH}/Tools/OpenSSLv3/Win_x64/bin").resolve()
for file in openSLL_path.iterdir():
if file.suffix == ".dll" and file.is_file():
print("Copy: ", file, build_config.bin_dir)
shutil.copy2(file, build_config.bin_dir)
if not platform.system() == "Darwin":