From 0cc62824b934f318f944253165cbc56c427418be Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sat, 5 Mar 2022 02:52:22 +0100 Subject: [PATCH] Use MinGW C++ compiler as well --- .github/workflows/testing.yml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index c1ae2086..0237adb4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -163,7 +163,7 @@ jobs: ./.github/actions/install_deps.sh ${{ matrix.os }} - name: Install MinGW run: | - sudo apt-get install gcc-mingw-w64-${{ matrix.arch }} mingw-w64-tools libz-mingw-w64-dev + sudo apt-get install {gcc,g++}-mingw-w64-${{ matrix.arch }} mingw-w64-tools libz-mingw-w64-dev - name: Install libpng dev headers for MinGW run: | sudo ./.github/actions/mingw-w64-libpng-dev.sh ${{ matrix.triplet }} diff --git a/Makefile b/Makefile index 027564c0..10e022c5 100644 --- a/Makefile +++ b/Makefile @@ -245,12 +245,12 @@ develop: # install instructions instead. mingw32: - $Q${MAKE} CC=i686-w64-mingw32-gcc BISON=bison \ - PKG_CONFIG=i686-w64-mingw32-pkg-config -j + $Q${MAKE} CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \ + BISON=bison PKG_CONFIG=i686-w64-mingw32-pkg-config -j mingw64: - $Q${MAKE} CC=x86_64-w64-mingw32-gcc BISON=bison \ - PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j + $Q${MAKE} CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ \ + BISON=bison PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j wine-shim: $Qecho '#!/bin/bash' > rgbshim.sh