Use MinGW C++ compiler as well

This commit is contained in:
ISSOtm
2022-03-05 02:52:22 +01:00
committed by Eldred Habert
parent 2fb1eb9136
commit 0cc62824b9
2 changed files with 5 additions and 5 deletions

View File

@@ -163,7 +163,7 @@ jobs:
./.github/actions/install_deps.sh ${{ matrix.os }} ./.github/actions/install_deps.sh ${{ matrix.os }}
- name: Install MinGW - name: Install MinGW
run: | 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 - name: Install libpng dev headers for MinGW
run: | run: |
sudo ./.github/actions/mingw-w64-libpng-dev.sh ${{ matrix.triplet }} sudo ./.github/actions/mingw-w64-libpng-dev.sh ${{ matrix.triplet }}

View File

@@ -245,12 +245,12 @@ develop:
# install instructions instead. # install instructions instead.
mingw32: mingw32:
$Q${MAKE} CC=i686-w64-mingw32-gcc BISON=bison \ $Q${MAKE} CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \
PKG_CONFIG=i686-w64-mingw32-pkg-config -j BISON=bison PKG_CONFIG=i686-w64-mingw32-pkg-config -j
mingw64: mingw64:
$Q${MAKE} CC=x86_64-w64-mingw32-gcc BISON=bison \ $Q${MAKE} CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ \
PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j BISON=bison PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j
wine-shim: wine-shim:
$Qecho '#!/bin/bash' > rgbshim.sh $Qecho '#!/bin/bash' > rgbshim.sh