ref: 0cc62824b934f318f944253165cbc56c427418be
parent: 2fb1eb91364347e1afae57314eee3279a1b1b7d0
author: ISSOtm <[email protected]>
date: Fri Mar 4 21:52:22 EST 2022
Use MinGW C++ compiler as well
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -163,7 +163,7 @@
./.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 }}
--- a/Makefile
+++ b/Makefile
@@ -245,12 +245,12 @@
# 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