From ceb2787d466713096ea9746d2b63a4608fdc35f6 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 22 Apr 2025 13:39:33 +0200 Subject: [PATCH] ci: Install mingw-w64-tools in the Linux image. For the build-mingw-32 and build-mingw-64 jobs. These currently end up picking up Linux pkg-config instead of MinGW pkg-config, which in turn causes configure to pick up Linux OpenGL and XCB. We happen to get away with that at the moment because none of the code using HAVE_OPENGL or HAVE_XCB ends up getting built for Windows, but that's about to change. Specifically, we'd like to build the vkd3d versions of the demos for Windows. --- gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/image.docker b/gitlab/image.docker index f86a5666e..e2135159b 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -27,7 +27,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \ - autoconf automake libtool flex bison curl \ + mingw-w64-tools autoconf automake libtool flex bison curl \ git ca-certificates rsync \ llvm-15-dev meson ninja-build python3-mako \ zlib1g-dev libexpat-dev libdrm-dev libglvnd-dev \