From c1571bfd8f3eb811ad0f8916d189f94d3f98ec80 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 30 Sep 2021 10:20:24 -0700 Subject: [PATCH v5 11/16] meson: prereq: Handle DLSUFFIX in msvc builds similar to other build envs. --- src/include/port/win32_port.h | 3 --- src/tools/msvc/Mkvcbuild.pm | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h index c1c4831595a..72b2d2b5a01 100644 --- a/src/include/port/win32_port.h +++ b/src/include/port/win32_port.h @@ -529,9 +529,6 @@ typedef unsigned short mode_t; #define W_OK 2 #define R_OK 4 -/* Pulled from Makefile.port in MinGW */ -#define DLSUFFIX ".dll" - #endif /* _MSC_VER */ #if (defined(_MSC_VER) && (_MSC_VER < 1900)) || \ diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index b8e62c6d3f7..47b5c43357a 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -195,6 +195,7 @@ sub mkvcbuild 'syncrep_gram.y'); $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', 'jsonpath_gram.y'); + $postgres->AddDefine('DLSUFFIX=".dll"'); $postgres->AddDefine('BUILDING_DLL'); $postgres->AddLibrary('secur32.lib'); $postgres->AddLibrary('ws2_32.lib'); @@ -298,6 +299,7 @@ sub mkvcbuild my $libecpg = $solution->AddProject('libecpg', 'dll', 'interfaces', 'src/interfaces/ecpg/ecpglib'); $libecpg->AddDefine('FRONTEND'); + $libecpg->AddDefine('DLSUFFIX=".dll"'); $libecpg->AddIncludeDir('src/interfaces/ecpg/include'); $libecpg->AddIncludeDir('src/interfaces/libpq'); $libecpg->AddIncludeDir('src/port'); @@ -845,6 +847,7 @@ sub mkvcbuild $pgregress->AddFile('src/test/regress/pg_regress.c'); $pgregress->AddFile('src/test/regress/pg_regress_main.c'); $pgregress->AddIncludeDir('src/port'); + $pgregress->AddDefine('DLSUFFIX=".dll"'); $pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $pgregress->AddLibrary('ws2_32.lib'); $pgregress->AddDirResourceFile('src/test/regress'); -- 2.23.0.385.gbc12974a89