From 0a149bd94f56206f0e1cd370085f2fdb3acef5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 21 Nov 2025 23:48:03 +0100 Subject: [PATCH] Windows: Fix 32-bit build cross-compiled with mingw64 libgcc and libstdc++ should be linked statically. --- platform/windows/detect.py | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index f0d6c75c15e..ea13916807b 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -56,7 +56,6 @@ def get_opts(): return [ ('mingw_prefix','Mingw Prefix',mingw), ('mingw_prefix_64','Mingw Prefix 64 bits',mingw64), - ('mingw64_for_32','Use Mingw 64 for 32 Bits Build',"no"), ] def get_flags(): @@ -146,22 +145,14 @@ def configure(env): if (env["bits"]=="default"): env["bits"]="32" - use64=False if (env["bits"]=="32"): - - if (env["mingw64_for_32"]=="yes"): - env.Append(CCFLAGS=['-m32']) - env.Append(LINKFLAGS=['-m32']) - env.Append(LINKFLAGS=['-static-libgcc']) - env.Append(LINKFLAGS=['-static-libstdc++']) - mingw_prefix=env["mingw_prefix_64"]; - else: - mingw_prefix=env["mingw_prefix"]; - - - else: - mingw_prefix=env["mingw_prefix_64"]; env.Append(LINKFLAGS=['-static']) + env.Append(LINKFLAGS=['-static-libgcc']) + env.Append(LINKFLAGS=['-static-libstdc++']) + mingw_prefix=env["mingw_prefix"]; + else: + env.Append(LINKFLAGS=['-static']) + mingw_prefix=env["mingw_prefix_64"]; nulstr="" @@ -210,15 +201,6 @@ def configure(env): env.Append(CCFLAGS=['-DGLES2_ENABLED','-DGLES1_ENABLED','-DGLEW_ENABLED']) env.Append(LIBS=['mingw32','opengl32', 'dsound', 'ole32', 'd3d9','winmm','gdi32','iphlpapi','wsock32','kernel32']) - if (env["bits"]=="32" and env["mingw64_for_32"]!="yes"): -# env.Append(LIBS=['gcc_s']) - #--with-arch=i686 - env.Append(CPPFLAGS=['-march=i686']) - env.Append(LINKFLAGS=['-march=i686']) - - - - #'d3dx9d' env.Append(CPPFLAGS=['-DMINGW_ENABLED']) env.Append(LINKFLAGS=['-g'])