mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 08:22:33 +02:00
Merge commit 'e85c5ac6b69f38976521f9fd842f5b5a47c08cc9'
# Conflicts: # Tools/defines.py
This commit is contained in:
commit
dfd311c5d5
@ -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...
|
# 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(CURL CONFIG REQUIRED)
|
||||||
find_package(sentry CONFIG REQUIRED)
|
find_package(sentry CONFIG REQUIRED)
|
||||||
find_package(OpenSSL CONFIG REQUIRED)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(
|
find_package(
|
||||||
|
@ -298,10 +298,17 @@ def package(build_config: BuildConfig):
|
|||||||
if platform.system() == "Windows":
|
if platform.system() == "Windows":
|
||||||
vcpkg_bin_path = Path(
|
vcpkg_bin_path = Path(
|
||||||
f"{build_config.root_path}/../vcpkg/installed/x64-windows/bin").resolve()
|
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():
|
for file in vcpkg_bin_path.iterdir():
|
||||||
if file.suffix == ".dll" and file.is_file():
|
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)
|
shutil.copy2(file, build_config.bin_dir)
|
||||||
|
|
||||||
if not platform.system() == "Darwin":
|
if not platform.system() == "Darwin":
|
||||||
|
Loading…
Reference in New Issue
Block a user