diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 78499521..f9aa3c39 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -276,7 +276,7 @@ jobs: Copy-AliasLib $gtkLib "gdk-3.0.lib" @('^gdk-3-0\.lib$', '^gdk-3\.lib$', '^gdk-3.*\.lib$') Copy-AliasLib $gtkLib "gdk-win32-3.0.lib" @('^gdk-win32-3-0\.lib$', '^gdk-win32-3\.lib$', '^gdk-win32-3.*\.lib$') - # Legacy GTK2 name expected by older vcxproj (keep it) + # GTK2 name expected by older vcxproj (keep it) Copy-AliasLib $gtkLib "gtk-win32-2.0.lib" @('^gtk-3\.0\.lib$', '^gtk-3-0\.lib$', '^gtk-3\.lib$', '^gtk-3.*\.lib$') # OpenSSL legacy names (keep older projects happy if referenced) @@ -286,6 +286,13 @@ jobs: # libxml2 legacy name Copy-AliasLib $gtkLib "libxml2.lib" @('^libxml2.*\.lib$') + # zlib legacy name expected by older vcxproj + Copy-AliasLib $gtkLib "zlib.lib" @( + '^zlib1\.lib$', + '^zlibstatic\.lib$', + '^zlib.*\.lib$' + ) + # Persist GTK root for later steps. "GTK_ROOT=$normRel" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8 @@ -316,15 +323,6 @@ jobs: exit /b 1 ) - if not exist "%GTKROOT%\include\lua.h" ( - echo Missing lua.h under %GTKROOT%\include - dir "%GTKROOT%\include" - ) - if not exist "%GTKROOT%\include\lua\lua.h" ( - echo Missing lua\lua.h under %GTKROOT%\include\lua - dir "%GTKROOT%\include\lua" - ) - set "PATH=%PERL_BIN%;%GTKROOT%\bin;%PATH%" set "LIB=%GTKROOT%\lib;%LIB%" set "INCLUDE=%GTKROOT%\include\lua;%GTKROOT%\include;%INCLUDE%"