From 7c5554ea3169a0112406f3029275e45b1725998c Mon Sep 17 00:00:00 2001 From: Dave Page Date: Tue, 21 May 2024 16:29:59 +0100 Subject: [PATCH] Fix the filename for the zlib library. Our build originally relied on a cmake/msbuild build of zlib, however, this is not the recommended way of building zlib (although it is the obvious one). We now build using nmake and copy, which results in a minor change of the filename. This is also consistent with what the PostgreSQL build system expects. --- Make.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.bat b/Make.bat index 5f1582c23..ba1f616cf 100644 --- a/Make.bat +++ b/Make.bat @@ -319,7 +319,7 @@ REM Main build sequence Ends COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-*-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" "%BUILDROOT%\runtime" > nul IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" "%BUILDROOT%\runtime" > nul - COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 + COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dump.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1 COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dumpall.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1L% COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_restore.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1