From a7b776f3b91030fe007cb6613a112dcbbcdc8bc4 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 10 Jan 2025 21:48:43 +0300 Subject: [PATCH] Revert "wscript: disable /showIncludes based msvcdeps for now, it causes issues with non-English locales" Add option --enable-msvcdeps that we only enable on CI. This reverts commit e58007aab382ce3a2fe8d4a62aaa4d324291cf34. --- scripts/gha/build_win32.sh | 3 ++- wscript | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh index 95017868..6f0f3d23 100755 --- a/scripts/gha/build_win32.sh +++ b/scripts/gha/build_win32.sh @@ -11,7 +11,8 @@ fi # NOTE: to build with other version use --msvc_version during configuration # NOTE: sometimes you may need to add WinSDK to %PATH% -./waf.bat configure -s "SDL2_VC" -T release --enable-utils --enable-tests --enable-lto $AMD64 || die_configure +# NOTE: --enable-msvcdeps only used for CI builds, enabling it non-English versions of MSVC causes useless console spam +./waf.bat configure -s "SDL2_VC" -T release --enable-utils --enable-tests --enable-lto --enable-msvcdeps $AMD64 || die_configure ./waf.bat build || die ./waf.bat install --destdir=. || die diff --git a/wscript b/wscript index da6c9d47..c0654e41 100644 --- a/wscript +++ b/wscript @@ -162,6 +162,7 @@ def options(opt): # a1ba: special option for me grp.add_option('--debug-all-servers', action='store_true', dest='ALL_SERVERS', default=False, help='') + grp.add_option('--enable-msvcdeps', action='store_true', dest='MSVCDEPS', default=False, help='') grp = opt.add_option_group('Renderers options') @@ -200,6 +201,9 @@ def configure(conf): # Load compilers early conf.load('xshlib xcompile compiler_c compiler_cxx gccdeps') + if conf.options.MSVCDEPS: + conf.load('msvcdeps') + if conf.options.NSWITCH: conf.load('nswitch')