Skip to content

Commit

Permalink
Revert "wscript: disable /showIncludes based msvcdeps for now, it cau…
Browse files Browse the repository at this point in the history
…ses issues with non-English locales"

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

This reverts commit e58007a.
  • Loading branch information
a1batross committed Jan 10, 2025
1 parent f2fb668 commit a7b776f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scripts/gha/build_win32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -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')

Expand Down

0 comments on commit a7b776f

Please sign in to comment.