From 884321a205121d9bc6903507ff32d999172dd4df Mon Sep 17 00:00:00 2001 From: abeimler Date: Sun, 6 Aug 2023 18:59:05 +0200 Subject: [PATCH] fix: install mingw with setup-cpp --- docker/Dockerfile.mingw | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/Dockerfile.mingw b/docker/Dockerfile.mingw index 0e8eb058..cd7717d8 100644 --- a/docker/Dockerfile.mingw +++ b/docker/Dockerfile.mingw @@ -11,13 +11,7 @@ RUN npm install -g setup-cpp FROM base AS setup # install cmake, ninja, and ccache -RUN setup-cpp --cmake true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true --powershell true - -# TODO: install cross-compiler with setup_cpp_linux -# NOTE: install mingw by hand, waiting for setup-cpp to have mingw cross-compiler support -RUN apt-get update && apt-get install -y \ - mingw-w64 \ - && rm -rf /var/lib/apt/lists/* +RUN setup-cpp --compiler mingw --cmake true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true --powershell true COPY ./docker/entrypoint.sh /docker-entrypoint.sh ENTRYPOINT [ "/docker-entrypoint.sh" ]