From aa0a6015b09258f9967b71f82a8a3068185623be Mon Sep 17 00:00:00 2001 From: Krzysztof Jakubowski Date: Sat, 21 Sep 2024 13:28:02 +0200 Subject: [PATCH] Updated ShaderC dependency to 2024.1, downloading it with conan --- tools/install_deps.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/tools/install_deps.py b/tools/install_deps.py index 19935b82..e9b7030c 100644 --- a/tools/install_deps.py +++ b/tools/install_deps.py @@ -115,28 +115,11 @@ def copy_subdirs(package_name: str, dst_dir: str, src_dir: str, subdirs: list[st PackageQuery("sdl", "2.26.1", windows_query), PackageQuery("vorbis", "1.3.7", windows_query), PackageQuery("zlib", "1.3", windows_query), + PackageQuery("shaderc", "2024.1", windows_query), PackageQuery("vulkan-headers", "1.3.236.0"), - # VulkanLoader no longer needed (replaced with Volk) - # PackageQuery("vulkan-loader", "1.3.236.0", "os=Windows and arch=x86_64"), - # TODO: shaderc is broken :( - # PackageQuery("shaderc", "2021.1", "os=Windows"), ] -def get_shaderc(install_path: str): - print('Downloading shaderc package...') - file_name = 'shaderc-2021-01-windows.zip' - url = f'https://github.com/nadult/libfwk/releases/download/v0.1/{file_name}' - if os.path.isfile(file_name): - os.remove(file_name) - urllib.request.urlretrieve(url, file_name) - print(f"Extracting shaderc...") - zip_file = zipfile.ZipFile(file_name, 'r') - zip_file.extractall(install_path) - zip_file.close() - os.remove(file_name) - - def main(): parser = argparse.ArgumentParser( prog='install_deps', @@ -155,7 +138,6 @@ def main(): install_path = os.path.join(install_path, 'x86_64') print(f"Installing packages at: {install_path}") os.makedirs(install_path, exist_ok=True) - get_shaderc(install_path) # TODO: multithreading for query in package_queries: