From 46424c38d93d97e9bcb2ae33dc937e71683ae610 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 3 Oct 2007 13:43:24 +0000 Subject: [PATCH] Build two more .DEF files for ecpg instead of using default ones. --- src/tools/msvc/Mkvcbuild.pm | 2 ++ src/tools/msvc/Solution.pm | 2 ++ src/tools/msvc/clean.bat | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 6aa09a8740..360bede09a 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -137,6 +137,7 @@ sub mkvcbuild $solution->AddProject('libpgtypes','dll','interfaces','src\interfaces\ecpg\pgtypeslib'); $pgtypes->AddDefine('FRONTEND'); $pgtypes->AddReference($libpgport); + $pgtypes->UseDef('src\interfaces\ecpg\pgtypeslib\pgtypeslib.def'); $pgtypes->AddIncludeDir('src\interfaces\ecpg\include'); my $libecpg =$solution->AddProject('libecpg','dll','interfaces','src\interfaces\ecpg\ecpglib'); @@ -152,6 +153,7 @@ sub mkvcbuild $solution->AddProject('libecpg_compat','dll','interfaces','src\interfaces\ecpg\compatlib'); $libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include'); $libecpgcompat->AddIncludeDir('src\interfaces\libpq'); + $libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def'); $libecpgcompat->AddReference($pgtypes,$libecpg,$libpgport); my $ecpg = $solution->AddProject('ecpg','exe','interfaces','src\interfaces\ecpg\preproc'); diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 1fa6a50d1d..1adc982a71 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -141,6 +141,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY $self->GenerateDefFile("src\\interfaces\\libpq\\libpqdll.def","src\\interfaces\\libpq\\exports.txt","LIBPQ"); $self->GenerateDefFile("src\\interfaces\\ecpg\\ecpglib\\ecpglib.def","src\\interfaces\\ecpg\\ecpglib\\exports.txt","LIBECPG"); + $self->GenerateDefFile("src\\interfaces\\ecpg\\compatlib\\compatlib.def","src\\interfaces\\ecpg\\compatlib\\exports.txt","LIBECPG_COMPAT"); + $self->GenerateDefFile("src\\interfaces\\ecpg\\pgtypeslib\\pgtypeslib.def","src\\interfaces\\ecpg\\pgtypeslib\\exports.txt","LIBPGTYPES"); if (IsNewer("src\\backend\\utils\\fmgrtab.c","src\\include\\catalog\\pg_proc.h")) { diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat index ca42c70d50..56c7e0b44f 100755 --- a/src/tools/msvc/clean.bat +++ b/src/tools/msvc/clean.bat @@ -31,7 +31,10 @@ call :del src\bin\psql\sql_help.h call :del src\interfaces\libpq\libpq.rc call :del src\interfaces\libpq\libpqdll.def +call :del src\interfaces\ecpg\compatlib\compatlib.def +call :del src\interfaces\ecpg\ecpglib\ecpglib.def call :del src\interfaces\ecpg\include\ecpg_config.h +call :del src\interfaces\ecpg\pgtypeslib\pgtypeslib.def call :del src\interfaces\ecpg\preproc\preproc.c call :del src\interfaces\ecpg\preproc\preproc.h -- 2.39.5