From 4a805b9b651a8aadddf99dc8bb0d67571d85ba6a Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Sat, 3 Jan 2026 11:45:24 +0000
Subject: [PATCH] Fix mingw toolchain rc file handling

---
 toolchain/mingw-toolchain.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/toolchain/mingw-toolchain.xml b/toolchain/mingw-toolchain.xml
index edc575f90..c7a11fa43 100644
--- a/toolchain/mingw-toolchain.xml
+++ b/toolchain/mingw-toolchain.xml
@@ -4,16 +4,19 @@
 
 <section if="linux_host||mac_host">
   <section if="HXCPP_M64">
-    <set name="HXCPP_MINGW_EXE" value="x86_64-w64-mingw32-g++" unless="HXCPP_MINGW_EXE" />
-    <set name="MINGW_ROOT" value="/usr/x86_64-w64-mingw32" unless="MINGW_ROOT" />
+    <set name="ABITRIPLE" value="x86_64-w64-mingw32" />
   </section>
   <section unless="HXCPP_M64">
-    <set name="HXCPP_MINGW_EXE" value="i686-w64-mingw32-g++" unless="HXCPP_MINGW_EXE" />
-    <set name="MINGW_ROOT" value="/usr/i686-w64-mingw32" unless="MINGW_ROOT" />
+    <set name="ABITRIPLE" value="i686-w64-mingw32" />
   </section>
+  <set name="EXEPREFIX" value="${ABITRIPLE}" />
+  <set name="HXCPP_MINGW_EXE" value="${EXEPREFIX}-g++" unless="HXCPP_MINGW_EXE" />
+  <set name="HXCPP_MINGW_RC_EXE" value="${EXEPREFIX}-windres" unless="HXCPP_MINGW_RC_EXE" />
+  <set name="MINGW_ROOT" value="/usr/${ABITRIPLE}" unless="MINGW_ROOT" />
 </section>
 
 <set name="HXCPP_MINGW_EXE" value="g++.exe" unless="HXCPP_MINGW_EXE"/>
+<set name="HXCPP_MINGW_RC_EXE" value="windres.exe" unless="HXCPP_MINGW_RC_EXE" />
 
 
 <setup name="mingw" />
@@ -45,6 +48,9 @@
   <objdir value="obj/mingw${OBJEXT}/"/>
   <outflag value="-o"/>
   <ext value=".o"/>
+
+  <rcexe name="${HXCPP_MINGW_RC_EXE}" />
+  <rcext value=".o" />
 </compiler>
 
 <linker id="dll" exe="g++">