vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "wscript: disable /showIncludes based msvcdeps for now, it causes issues with non-English locales"

Browse source 
Add option --enable-msvcdeps that we only enable on CI.

This reverts commit e58007aab3.
This commit is contained in:
Alibek Omarov 2025-01-10 21:48:43 +03:00
parent f2fb668c9e
commit a7b776f3b9
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/gha/build_win32.sh
View file

@ -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

4
wscript
View file

@ -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')