From 75b42a14939738babd189b2ffdc4d6a70131f3af Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:32:41 -0400 Subject: [PATCH] Flatpak: Use WZPrebuiltPackages.cmake --- .ci/flatpak/generate_flatpak_config.cmake | 5 +++++ .ci/flatpak/net.wz2100.wz2100.yaml.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.ci/flatpak/generate_flatpak_config.cmake b/.ci/flatpak/generate_flatpak_config.cmake index 327cc7f3e9a..26204f2b2f3 100644 --- a/.ci/flatpak/generate_flatpak_config.cmake +++ b/.ci/flatpak/generate_flatpak_config.cmake @@ -114,6 +114,11 @@ if(NOT DEFINED WZ_SENTRY_NATIVE_URL OR NOT DEFINED WZ_SENTRY_NATIVE_SHA512) endif() unset(_sentry_dl_data_file) +################################## +# Handle prebuilt-texture-packages + +include("${PROJECT_ROOT}/data/WZPrebuiltPackages.cmake") + ################################## # Debug output diff --git a/.ci/flatpak/net.wz2100.wz2100.yaml.in b/.ci/flatpak/net.wz2100.wz2100.yaml.in index 7100bb5e6f5..1eac1eb386a 100755 --- a/.ci/flatpak/net.wz2100.wz2100.yaml.in +++ b/.ci/flatpak/net.wz2100.wz2100.yaml.in @@ -80,8 +80,8 @@ modules: - cp "high.wz" /app/prestaged-dl sources: - type: file - url: "https://github.com/Warzone2100/data-terrain-high/releases/download/v1/high.wz" - sha512: "44a39e585344b25ab0fa4ed769f2b48bf23a0e4fc4b23e0fab4e68643cc6e3ebeabba790e8b1e6c96493ad01b6a2f09e92b893063013077dcac2475f0b5373d6" + url: @WZ_PREBUILT_TERRAIN_HIGH_DL_URL@ + sha512: @WZ_PREBUILT_TERRAIN_HIGH_DL_SHA512@ dest-filename: high.wz - name: glslc