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

Fix setup script

Browse Source
This commit is contained in:
Elias Steurer 2022-07-22 13:35:23 +02:00
parent a8cad9eb76
commit 962f3ea4cd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/download_ffmpeg.py
View File

@ -99,12 +99,9 @@ def download_prebuild_ffmpeg_windows(extraction_path: str):
extract_zip_executables(extraction_path, ffmpeg_path_and_filename)
if __name__ == "__main__":
def execute():
# Make sure the script is always started from the same folder
root_path = cd_repo_root_path()
tools_path = os.path.join(root_path, "Tools")
extraction_path = os.path.join(root_path, "Common/ffmpeg")
if os.path.exists(extraction_path):
@ -112,8 +109,11 @@ if __name__ == "__main__":
os.makedirs(extraction_path)
if platform.system() == "Windows":
download_prebuild_ffmpeg_windows(extraction_path)
elif platform.os.system() == "Darwin":
elif platform.system() == "Darwin":
download_prebuild_ffmpeg_mac(extraction_path)
if __name__ == "__main__":
execute()

4
Tools/setup.py
View File

@ -78,12 +78,13 @@ without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Q
"libarchive"
]
download_ffmpeg.execute()
if system() == "Windows":
vcpkg_command = "vcpkg.exe"
vcpkg_packages_list.append("infoware[d3d]")
vcpkg_packages_list.append("sentry-native")
platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False)
download_ffmpeg.download_prebuild_ffmpeg_windows()
vcpkg_triplet = ["x64-windows"]
elif system() == "Darwin":
vcpkg_command = "./vcpkg"
@ -93,7 +94,6 @@ without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Q
platform_command.add("./bootstrap-vcpkg.sh", vcpkg_path, False)
platform_command.add("chmod +x vcpkg", vcpkg_path)
vcpkg_triplet = ["x64-osx", "arm64-osx"]
download_ffmpeg.download_prebuild_ffmpeg_mac()
elif system() == "Linux":
vcpkg_command = "./vcpkg"
#vcpkg_packages_list.append("infoware[opengl]")