diff options
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | ci/appveyor.bat | 8 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f0bc49dd1..2c0857ca53 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -472,17 +472,15 @@ jobs: run: | call "%VCVARSALL%" ${{ matrix.vcarch }} cd src - :: Filter out the progress bar from the build log - sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak if "${{ matrix.features }}"=="HUGE" ( - nmake -nologo -f Make_mvc2.mak ^ + nmake -nologo -f Make_mvc.mak ^ FEATURES=${{ matrix.features }} ^ GUI=yes IME=yes ICONV=yes VIMDLL=yes ^ DYNAMIC_LUA=yes LUA=%LUA_DIR% ^ DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^ DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ) else ( - nmake -nologo -f Make_mvc2.mak ^ + nmake -nologo -f Make_mvc.mak ^ FEATURES=${{ matrix.features }} ^ GUI=yes IME=yes ICONV=yes VIMDLL=yes ) diff --git a/ci/appveyor.bat b/ci/appveyor.bat index 5d5a9f182f..92ec936f98 100644 --- a/ci/appveyor.bat +++ b/ci/appveyor.bat @@ -5,11 +5,9 @@ setlocal ENABLEDELAYEDEXPANSION cd %APPVEYOR_BUILD_FOLDER% cd src -:: Filter out the progress bar from the build log -sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak echo "Building MSVC 64bit console Version" -nmake -f Make_mvc2.mak CPU=AMD64 ^ +nmake -f Make_mvc.mak CPU=AMD64 ^ OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^ FEATURES=%FEATURE% if not exist vim.exe ( @@ -21,13 +19,13 @@ if not exist vim.exe ( :: GUI needs to be last, so that testing works echo "Building MSVC 64bit GUI Version" if "%FEATURE%" == "HUGE" ( - nmake -f Make_mvc2.mak CPU=AMD64 ^ + nmake -f Make_mvc.mak CPU=AMD64 ^ OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^ PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^ PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^ FEATURES=%FEATURE% ) ELSE ( - nmake -f Make_mvc2.mak CPU=AMD64 ^ + nmake -f Make_mvc.mak CPU=AMD64 ^ OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^ FEATURES=%FEATURE% ) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index cb66fc7962..a8d50001f2 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1279,10 +1279,16 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \ $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB) -# Report link time code generation progress if used. +# Enable link time code generation if needed. !ifdef NODEBUG ! if "$(OPTIMIZE)" != "SPACE" +! if "$(CI)" == "true" || "$(CI)" == "True" +# Enable link time code generation, but do not show the progress. +LINKARGS1 = $(LINKARGS1) /LTCG +! else +# Report link time code generation progress. LINKARGS1 = $(LINKARGS1) /LTCG:STATUS +! endif ! endif !endif diff --git a/src/version.c b/src/version.c index 3d4fac60f0..db051aa27b 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4222, +/**/ 4221, /**/ 4220, |