From 7d23ab72be1f5fc541e919ad98c63f5ee2c9b94c Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 27 Sep 2022 22:37:43 +0100
Subject: [PATCH] Force usage of i686-w64-mingw32 for win32 builds on 64bit
 systems

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 54d96d699..e1b96c0e9 100644
--- a/Makefile
+++ b/Makefile
@@ -324,18 +324,24 @@ endif
 LIBS_WINE32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32e.a
 LIBS_RWIN32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32.a
 
-win32: $(LIBS_WINE32)
+ifeq ($(CC),x86_64-w64-mingw32-gcc)
+win32:
+	$(MAKE) AR=i686-w64-mingw32-ar CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ win32-i686
+
+win32r:
+	$(MAKE) AR=i686-w64-mingw32-ar CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ win32r-i686
+else
+win32: win32-i686
+win32r: win32r-i686
+endif
+
+win32-i686: $(LIBS_WINE32)
 	$(MAKE) BUILDING_FOR_WINE=true -C source/bridges-plugin win32
 	$(MAKE) BUILDING_FOR_WINE=true -C source/discovery win32
 
-win32r: $(LIBS_RWIN32)
-ifeq ($(CC),x86_64-w64-mingw32-gcc)
-	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ -C source/bridges-plugin win32
-	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ -C source/discovery win32
-else
+win32r-i686: $(LIBS_RWIN32)
 	$(MAKE) -C source/bridges-plugin win32
 	$(MAKE) -C source/discovery win32
-endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Binaries (win64)