diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-09-06 02:58:33 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-09-06 02:58:33 +0000 |
| commit | 02566f14f4d08452a2c5ff43f0bba78eb657dfd8 (patch) | |
| tree | 668c14681b4b7b0bc26a04619cad028e42c2e2a6 /src | |
| parent | 16910e44de129ce1ae16b1a97f95a61ec984d2c9 (diff) | |
| download | postgresql-02566f14f4d08452a2c5ff43f0bba78eb657dfd8.tar.gz postgresql-02566f14f4d08452a2c5ff43f0bba78eb657dfd8.zip | |
On Sat, Aug 25, 2001 at 08:15:45PM -0400, Bruce Momjian wrote:
> Can someone research this and figure out what the proper solution for
> this is? Seems we are going around in circles if we keep
> adding/removing DLLIMPORT.
I believe that the attached patch is the correct solution -- I apologize
for the gyrations. With the attached patch, Cygwin libpq++ builds
cleanly again. The root cause was that DLLIMPORT was defaulting to
__declspec(dllimport) since BUILDING_DLL was *not* defined when building
the libpq++ DLL.
Unfortunately, to test my patch requires changing the following makefile:
src/interfaces/libpq++/examples/Makefile
and the #includes in all of the *.cc to build against the source tree
instead of the following hardcoded installation directory structure:
/usr/local/pgsql
I was able to manually build
src/interfaces/libpq++/examples/testlibpq0.exe
against my Cygwin libpq++ without errors. However, I have not tried to
actually test testlibpq0.exe.
Is this sufficient? Or, do you want me to clean up libpq++/examples too?
(Or, is it silly to even ask? :,)) Let me know how you want to proceed and
I will submit a patch to pgsql-patches.
Jason Tishler
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefiles/Makefile.win | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win index cca9bcbbe0f..e91e5a57464 100644 --- a/src/makefiles/Makefile.win +++ b/src/makefiles/Makefile.win @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.14 2001/08/29 19:14:40 petere Exp $ +# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.15 2001/09/06 02:58:33 momjian Exp $ LDFLAGS+= -g DLLTOOL= dlltool DLLWRAP= dllwrap @@ -28,6 +28,10 @@ ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib) override CPPFLAGS+= -DBUILDING_DLL=1 endif +ifeq ($(findstring interfaces/libpq++,$(subdir)), interfaces/libpq++) +override CPPFLAGS+= -DBUILDING_DLL=1 +endif + ifeq ($(findstring src/pl/plpython,$(subdir)), src/pl/plpython) override CPPFLAGS+= -DUSE_DL_IMPORT endif |