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

Fix vcpkg command call

Browse Source
This commit is contained in:
Elias Steurer 2021-06-25 12:32:19 +02:00
parent b70ba77714
commit 60bf972c26
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/setup.py
View File

@ -42,15 +42,16 @@ if __name__ == "__main__":
] ]
vcpkg_triplet = "" vcpkg_triplet = ""
executable_file_suffix = "" vcpkg_command = ""
if sys.platform == "win32": if sys.platform == "win32":
vcpkg_command = "vcpkg.exe"
vcpkg_packages_list.append("infoware[d3d]") vcpkg_packages_list.append("infoware[d3d]")
executable_file_suffix = ".exe"
execute("download_ffmpeg.bat", project_source_path + "/Tools", False) execute("download_ffmpeg.bat", project_source_path + "/Tools", False)
execute("bootstrap-vcpkg.bat", vcpkg_path, False) execute("bootstrap-vcpkg.bat", vcpkg_path, False)
vcpkg_triplet = "x64-windows" vcpkg_triplet = "x64-windows"
elif sys.platform == "darwin": elif sys.platform == "darwin":
vcpkg_command = "./vcpkg"
vcpkg_packages_list.append("infoware[opencl]") vcpkg_packages_list.append("infoware[opencl]")
vcpkg_packages_list.append("curl") # Hidden dependency from sentry vcpkg_packages_list.append("curl") # Hidden dependency from sentry
execute("chmod +x bootstrap-vcpkg.sh", vcpkg_path) execute("chmod +x bootstrap-vcpkg.sh", vcpkg_path)
@ -58,6 +59,7 @@ if __name__ == "__main__":
execute("chmod +x vcpkg", vcpkg_path) execute("chmod +x vcpkg", vcpkg_path)
vcpkg_triplet = "x64-osx" vcpkg_triplet = "x64-osx"
elif sys.platform == "linux": elif sys.platform == "linux":
vcpkg_command = "./vcpkg"
vcpkg_packages_list.append("infoware[opencl]") vcpkg_packages_list.append("infoware[opencl]")
execute("chmod +x bootstrap-vcpkg.sh", vcpkg_path) execute("chmod +x bootstrap-vcpkg.sh", vcpkg_path)
execute("./bootstrap-vcpkg.sh", vcpkg_path, False) execute("./bootstrap-vcpkg.sh", vcpkg_path, False)
@ -65,8 +67,8 @@ if __name__ == "__main__":
vcpkg_triplet = "x64-linux" vcpkg_triplet = "x64-linux"
vcpkg_packages = " ".join(vcpkg_packages_list) vcpkg_packages = " ".join(vcpkg_packages_list)
execute("./vcpkg{} update".format(executable_file_suffix), vcpkg_path, False) execute("{} update".format(vcpkg_command), vcpkg_path, False)
execute("./vcpkg{} upgrade --no-dry-run".format(executable_file_suffix), execute("{} upgrade --no-dry-run".format(vcpkg_command),
vcpkg_path, False) vcpkg_path, False)
execute("./vcpkg{} install {} --triplet {} --recurse".format(executable_file_suffix, execute("{} install {} --triplet {} --recurse".format(vcpkg_command,
vcpkg_packages, vcpkg_triplet), vcpkg_path, False) vcpkg_packages, vcpkg_triplet), vcpkg_path, False)