agora inbox for pgsql-interfaces@postgresql.org
help / color / mirror / Atom feedFrom: Christian Ullrich <chris@chrullrich.de>
To: pgsql-interfaces@postgresql.org
Subject: Re: libpq++ on Windows
Date: Mon, 2 Jul 2001 16:57:02 +0200
Message-ID: <20010702165702.A1161@christian.chrullrich.de> (raw)
In-Reply-To: <1598.994047705@sss.pgh.pa.us>
References: <20010701174549.A976@christian.chrullrich.de>
<Pine.LNX.4.30.0107012027420.1674-100000@peter.localdomain>
<20010702002319.A1387@christian.chrullrich.de>
<1598.994047705@sss.pgh.pa.us>
* Tom Lane wrote on Monday, 2001-07-02:
> config.h.in is absolutely NOT the right place for platform-specific
> defines.
>
> I'd put this in the same category as DLLIMPORT, which is in c.h
> (and just as ugly an example of Microsoft cultural imperialism,
> but I suppose there's no point in arguing about it).
Thanks for the help. You know, if I had looked into c.h in the first
place, I might just have found that out myself.
Here's another patch. It extends the DLLIMPORT declaration
block and allows me to use that same macro in the class headers.
I think it is correctly used there.
--
Christian Ullrich Registrierter Linux-User #125183
"Sie können nach R'ed'mond fliegen -- aber Sie werden sterben"
diff -urN postgresql-7.1.2.orig/src/include/c.h postgresql-7.1.2/src/include/c.h
--- postgresql-7.1.2.orig/src/include/c.h Thu Mar 22 04:00:24 2001
+++ postgresql-7.1.2/src/include/c.h Mon Jul 2 09:35:41 2001
@@ -606,8 +606,14 @@
#else /* not BUILDING_DLL */
#define DLLIMPORT __declspec (dllimport)
#endif
-#else /* not CYGWIN */
-#define DLLIMPORT
+#elif defined(WIN32) && defined(_MSC_VER) /* not CYGWIN */
+#if defined(_DLL)
+#define DLLIMPORT __declspec (dllexport)
+#else /* not _DLL */
+#define DLLIMPORT __declspec (dllimport)
+#endif
+#else /* not CYGWIN, not MSVC */
+#define DLLIMPORT
#endif
/* Provide prototypes for routines not present in a particular machine's
diff -urN postgresql-7.1.2.orig/src/include/config.h.win32 postgresql-7.1.2/src/include/config.h.win32
--- postgresql-7.1.2.orig/src/include/config.h.win32 Fri May 11 01:34:42 2001
+++ postgresql-7.1.2/src/include/config.h.win32 Mon Jul 2 09:28:12 2001
@@ -20,3 +20,6 @@
#define HAVE_ATEXIT
#define HAVE_MEMMOVE
+
+#define HAVE_CXX_STRING_HEADER
+#define HAVE_NAMESPACE_STD
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/libpq++dll.rc postgresql-7.1.2/src/interfaces/libpq++/libpq++dll.rc
--- postgresql-7.1.2.orig/src/interfaces/libpq++/libpq++dll.rc Thu Jan 1 00:00:00 1970
+++ postgresql-7.1.2/src/interfaces/libpq++/libpq++dll.rc Mon Jul 2 09:21:00 2001
@@ -0,0 +1,34 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 7,1,2,0
+ PRODUCTVERSION 7,1,2,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "\0"
+ VALUE "CompanyName", " \0"
+ VALUE "FileDescription", "PostgreSQL C++ Access Library\0"
+ VALUE "FileVersion", "7, 1, 2, 0\0"
+ VALUE "InternalName", "libpq++\0"
+ VALUE "LegalCopyright", "Copyright © 2000\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "libpq++.dll\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "PostgreSQL\0"
+ VALUE "ProductVersion", "7, 1, 2, 0\0"
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgconnection.h postgresql-7.1.2/src/interfaces/libpq++/pgconnection.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgconnection.h Sat Feb 10 02:31:30 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgconnection.h Mon Jul 2 09:28:35 2001
@@ -55,7 +55,7 @@
// This class contains all the information about the connection
// to the backend process. All the database classes should be
// derived from this class to obtain the connection interface.
-class PgConnection {
+class DLLIMPORT PgConnection {
protected:
PGconn* pgConn; // Connection Structure
PGresult* pgResult; // Current Query Result
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgcursordb.h postgresql-7.1.2/src/interfaces/libpq++/pgcursordb.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgcursordb.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgcursordb.h Mon Jul 2 09:28:56 2001
@@ -36,7 +36,7 @@
// manipulates data through it. The interface will introduce some
// ease of use through the methods that will allow cursor specific
// operations, like fetch, forward, etc.
-class PgCursor : public PgTransaction {
+class DLLIMPORT PgCursor : public PgTransaction {
public:
PgCursor(const char* conninfo, const char* cursor); // use reasonable & environment defaults
// connect to the database with given environment and database name
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgdatabase.h postgresql-7.1.2/src/interfaces/libpq++/pgdatabase.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgdatabase.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgdatabase.h Mon Jul 2 09:28:51 2001
@@ -34,7 +34,7 @@
// This is the basic database access class. Its interface should
// be used only after a query has been sent to the backend and
// results are being received.
-class PgDatabase : public PgConnection {
+class DLLIMPORT PgDatabase : public PgConnection {
public:
// connect to the database with conninfo
PgDatabase(const char* conninfo) : PgConnection(conninfo) {}
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pglobject.h postgresql-7.1.2/src/interfaces/libpq++/pglobject.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pglobject.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pglobject.h Mon Jul 2 09:28:44 2001
@@ -29,7 +29,7 @@
// PgLargeObject - a class for accessing Large Object in a database
//
// ****************************************************************
-class PgLargeObject : public PgConnection {
+class DLLIMPORT PgLargeObject : public PgConnection {
private:
int pgFd;
Oid pgObject;
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgtransdb.h postgresql-7.1.2/src/interfaces/libpq++/pgtransdb.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgtransdb.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgtransdb.h Mon Jul 2 09:29:03 2001
@@ -34,7 +34,7 @@
// This is the database access class that keeps an open
// transaction block during its lifetime. The block is ENDed when
// the object is destroyed.
-class PgTransaction : public PgDatabase {
+class DLLIMPORT PgTransaction : public PgDatabase {
public:
PgTransaction(const char* conninfo); // use reasonable & environment defaults
// connect to the database with given environment and database name
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/win32.mak postgresql-7.1.2/src/interfaces/libpq++/win32.mak
--- postgresql-7.1.2.orig/src/interfaces/libpq++/win32.mak Thu Jan 1 00:00:00 1970
+++ postgresql-7.1.2/src/interfaces/libpq++/win32.mak Mon Jul 2 09:21:00 2001
@@ -0,0 +1,126 @@
+# Makefile for Microsoft Visual C++ 6.0 (or compat)
+
+# Will build a Win32 static library (non-debug) libpq++.lib
+# and a Win32 dynamic library (non-debug) libpq++.dll with import library libpq++dll.lib
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+.SUFFIXES : .cc
+
+CPP=cl.exe
+RSC=rc.exe
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\libpq++.dll" "$(OUTDIR)\libpq++.lib"
+
+CLEAN :
+ -@erase "$(INTDIR)\pgconnection.obj"
+ -@erase "$(INTDIR)\pgcursordb.obj"
+ -@erase "$(INTDIR)\pgdatabase.obj"
+ -@erase "$(INTDIR)\pglobject.obj"
+ -@erase "$(INTDIR)\pgtransdb.obj"
+ -@erase "$(OUTDIR)\libpq++.lib"
+ -@erase "$(OUTDIR)\libpq++.dll"
+ -@erase "$(OUTDIR)\libpq++dll.exp"
+ -@erase "$(OUTDIR)\libpq++dll.lib"
+ -@erase "$(OUTDIR)\libpq++dll.res"
+ -@erase "*.pch"
+ -@erase "$(OUTDIR)\libpq++.pch"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /TP /MD /W3 /GX /O2 /I "..\..\include" /I "..\libpq" /D "NDEBUG" /D\
+ "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq++.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
+
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libpq++.lib"
+LIB32_OBJS= \
+ "$(OUTDIR)\pgconnection.obj" \
+ "$(OUTDIR)\pgcursordb.obj" \
+ "$(OUTDIR)\pgdatabase.obj" \
+ "$(OUTDIR)\pglobject.obj" \
+ "$(OUTDIR)\pgtransdb.obj"
+
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq++dll.res"
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib wsock32.lib\
+ odbccp32.lib libpq.lib msvcrt.lib /nologo /subsystem:windows /dll /incremental:no\
+ /pdb:"$(OUTDIR)\libpq++.pdb" /machine:I386 /out:"$(OUTDIR)\libpq++.dll"\
+ /implib:"$(OUTDIR)\libpq++dll.lib" /libpath:"..\libpq\release"
+LINK32_OBJS= \
+ "$(OUTDIR)\pgconnection.obj" \
+ "$(OUTDIR)\pgcursordb.obj" \
+ "$(OUTDIR)\pgdatabase.obj" \
+ "$(OUTDIR)\pglobject.obj" \
+ "$(OUTDIR)\pgtransdb.obj" \
+ "$(OUTDIR)\libpq++dll.res"
+
+"$(INTDIR)\libpq++dll.res" : "$(INTDIR)" libpq++dll.rc
+ $(RSC) $(RSC_PROJ) libpq++dll.rc
+
+"$(OUTDIR)\libpq++.lib" : "$(OUTDIR)" $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(LIB32_OBJS)
+<<
+
+"$(OUTDIR)\libpq++.dll" : "$(OUTDIR)" $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cc{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cc{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
diff -urN postgresql-7.1.2.orig/src/win32.mak postgresql-7.1.2/src/win32.mak
--- postgresql-7.1.2.orig/src/win32.mak Tue Jan 18 19:05:29 2000
+++ postgresql-7.1.2/src/win32.mak Mon Jul 2 09:21:00 2001
@@ -20,6 +20,8 @@
cd ..
cd interfaces\libpq
nmake /f win32.mak $(MAKEMACRO)
+ cd ..\libpq++
+ nmake /f win32.mak $(MAKEMACRO)
cd ..\..\bin\psql
nmake /f win32.mak $(MAKEMACRO)
cd ..\..
Attachments:
[text/plain] libpq++-2.diff (9.2K, ../20010702165702.A1161@christian.chrullrich.de/2-libpq++-2.diff)
download | inline diff:
diff -urN postgresql-7.1.2.orig/src/include/c.h postgresql-7.1.2/src/include/c.h
--- postgresql-7.1.2.orig/src/include/c.h Thu Mar 22 04:00:24 2001
+++ postgresql-7.1.2/src/include/c.h Mon Jul 2 09:35:41 2001
@@ -606,8 +606,14 @@
#else /* not BUILDING_DLL */
#define DLLIMPORT __declspec (dllimport)
#endif
-#else /* not CYGWIN */
-#define DLLIMPORT
+#elif defined(WIN32) && defined(_MSC_VER) /* not CYGWIN */
+#if defined(_DLL)
+#define DLLIMPORT __declspec (dllexport)
+#else /* not _DLL */
+#define DLLIMPORT __declspec (dllimport)
+#endif
+#else /* not CYGWIN, not MSVC */
+#define DLLIMPORT
#endif
/* Provide prototypes for routines not present in a particular machine's
diff -urN postgresql-7.1.2.orig/src/include/config.h.win32 postgresql-7.1.2/src/include/config.h.win32
--- postgresql-7.1.2.orig/src/include/config.h.win32 Fri May 11 01:34:42 2001
+++ postgresql-7.1.2/src/include/config.h.win32 Mon Jul 2 09:28:12 2001
@@ -20,3 +20,6 @@
#define HAVE_ATEXIT
#define HAVE_MEMMOVE
+
+#define HAVE_CXX_STRING_HEADER
+#define HAVE_NAMESPACE_STD
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/libpq++dll.rc postgresql-7.1.2/src/interfaces/libpq++/libpq++dll.rc
--- postgresql-7.1.2.orig/src/interfaces/libpq++/libpq++dll.rc Thu Jan 1 00:00:00 1970
+++ postgresql-7.1.2/src/interfaces/libpq++/libpq++dll.rc Mon Jul 2 09:21:00 2001
@@ -0,0 +1,34 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 7,1,2,0
+ PRODUCTVERSION 7,1,2,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "\0"
+ VALUE "CompanyName", " \0"
+ VALUE "FileDescription", "PostgreSQL C++ Access Library\0"
+ VALUE "FileVersion", "7, 1, 2, 0\0"
+ VALUE "InternalName", "libpq++\0"
+ VALUE "LegalCopyright", "Copyright © 2000\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "libpq++.dll\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "PostgreSQL\0"
+ VALUE "ProductVersion", "7, 1, 2, 0\0"
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgconnection.h postgresql-7.1.2/src/interfaces/libpq++/pgconnection.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgconnection.h Sat Feb 10 02:31:30 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgconnection.h Mon Jul 2 09:28:35 2001
@@ -55,7 +55,7 @@
// This class contains all the information about the connection
// to the backend process. All the database classes should be
// derived from this class to obtain the connection interface.
-class PgConnection {
+class DLLIMPORT PgConnection {
protected:
PGconn* pgConn; // Connection Structure
PGresult* pgResult; // Current Query Result
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgcursordb.h postgresql-7.1.2/src/interfaces/libpq++/pgcursordb.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgcursordb.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgcursordb.h Mon Jul 2 09:28:56 2001
@@ -36,7 +36,7 @@
// manipulates data through it. The interface will introduce some
// ease of use through the methods that will allow cursor specific
// operations, like fetch, forward, etc.
-class PgCursor : public PgTransaction {
+class DLLIMPORT PgCursor : public PgTransaction {
public:
PgCursor(const char* conninfo, const char* cursor); // use reasonable & environment defaults
// connect to the database with given environment and database name
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgdatabase.h postgresql-7.1.2/src/interfaces/libpq++/pgdatabase.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgdatabase.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgdatabase.h Mon Jul 2 09:28:51 2001
@@ -34,7 +34,7 @@
// This is the basic database access class. Its interface should
// be used only after a query has been sent to the backend and
// results are being received.
-class PgDatabase : public PgConnection {
+class DLLIMPORT PgDatabase : public PgConnection {
public:
// connect to the database with conninfo
PgDatabase(const char* conninfo) : PgConnection(conninfo) {}
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pglobject.h postgresql-7.1.2/src/interfaces/libpq++/pglobject.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pglobject.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pglobject.h Mon Jul 2 09:28:44 2001
@@ -29,7 +29,7 @@
// PgLargeObject - a class for accessing Large Object in a database
//
// ****************************************************************
-class PgLargeObject : public PgConnection {
+class DLLIMPORT PgLargeObject : public PgConnection {
private:
int pgFd;
Oid pgObject;
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/pgtransdb.h postgresql-7.1.2/src/interfaces/libpq++/pgtransdb.h
--- postgresql-7.1.2.orig/src/interfaces/libpq++/pgtransdb.h Wed Jan 24 19:43:32 2001
+++ postgresql-7.1.2/src/interfaces/libpq++/pgtransdb.h Mon Jul 2 09:29:03 2001
@@ -34,7 +34,7 @@
// This is the database access class that keeps an open
// transaction block during its lifetime. The block is ENDed when
// the object is destroyed.
-class PgTransaction : public PgDatabase {
+class DLLIMPORT PgTransaction : public PgDatabase {
public:
PgTransaction(const char* conninfo); // use reasonable & environment defaults
// connect to the database with given environment and database name
diff -urN postgresql-7.1.2.orig/src/interfaces/libpq++/win32.mak postgresql-7.1.2/src/interfaces/libpq++/win32.mak
--- postgresql-7.1.2.orig/src/interfaces/libpq++/win32.mak Thu Jan 1 00:00:00 1970
+++ postgresql-7.1.2/src/interfaces/libpq++/win32.mak Mon Jul 2 09:21:00 2001
@@ -0,0 +1,126 @@
+# Makefile for Microsoft Visual C++ 6.0 (or compat)
+
+# Will build a Win32 static library (non-debug) libpq++.lib
+# and a Win32 dynamic library (non-debug) libpq++.dll with import library libpq++dll.lib
+
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+.SUFFIXES : .cc
+
+CPP=cl.exe
+RSC=rc.exe
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\libpq++.dll" "$(OUTDIR)\libpq++.lib"
+
+CLEAN :
+ -@erase "$(INTDIR)\pgconnection.obj"
+ -@erase "$(INTDIR)\pgcursordb.obj"
+ -@erase "$(INTDIR)\pgdatabase.obj"
+ -@erase "$(INTDIR)\pglobject.obj"
+ -@erase "$(INTDIR)\pgtransdb.obj"
+ -@erase "$(OUTDIR)\libpq++.lib"
+ -@erase "$(OUTDIR)\libpq++.dll"
+ -@erase "$(OUTDIR)\libpq++dll.exp"
+ -@erase "$(OUTDIR)\libpq++dll.lib"
+ -@erase "$(OUTDIR)\libpq++dll.res"
+ -@erase "*.pch"
+ -@erase "$(OUTDIR)\libpq++.pch"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /TP /MD /W3 /GX /O2 /I "..\..\include" /I "..\libpq" /D "NDEBUG" /D\
+ "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq++.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
+
+CPP_OBJS=.\Release/
+CPP_SBRS=.
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libpq++.lib"
+LIB32_OBJS= \
+ "$(OUTDIR)\pgconnection.obj" \
+ "$(OUTDIR)\pgcursordb.obj" \
+ "$(OUTDIR)\pgdatabase.obj" \
+ "$(OUTDIR)\pglobject.obj" \
+ "$(OUTDIR)\pgtransdb.obj"
+
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq++dll.res"
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib wsock32.lib\
+ odbccp32.lib libpq.lib msvcrt.lib /nologo /subsystem:windows /dll /incremental:no\
+ /pdb:"$(OUTDIR)\libpq++.pdb" /machine:I386 /out:"$(OUTDIR)\libpq++.dll"\
+ /implib:"$(OUTDIR)\libpq++dll.lib" /libpath:"..\libpq\release"
+LINK32_OBJS= \
+ "$(OUTDIR)\pgconnection.obj" \
+ "$(OUTDIR)\pgcursordb.obj" \
+ "$(OUTDIR)\pgdatabase.obj" \
+ "$(OUTDIR)\pglobject.obj" \
+ "$(OUTDIR)\pgtransdb.obj" \
+ "$(OUTDIR)\libpq++dll.res"
+
+"$(INTDIR)\libpq++dll.res" : "$(INTDIR)" libpq++dll.rc
+ $(RSC) $(RSC_PROJ) libpq++dll.rc
+
+"$(OUTDIR)\libpq++.lib" : "$(OUTDIR)" $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(LIB32_OBJS)
+<<
+
+"$(OUTDIR)\libpq++.dll" : "$(OUTDIR)" $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cc{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cc{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
diff -urN postgresql-7.1.2.orig/src/win32.mak postgresql-7.1.2/src/win32.mak
--- postgresql-7.1.2.orig/src/win32.mak Tue Jan 18 19:05:29 2000
+++ postgresql-7.1.2/src/win32.mak Mon Jul 2 09:21:00 2001
@@ -20,6 +20,8 @@
cd ..
cd interfaces\libpq
nmake /f win32.mak $(MAKEMACRO)
+ cd ..\libpq++
+ nmake /f win32.mak $(MAKEMACRO)
cd ..\..\bin\psql
nmake /f win32.mak $(MAKEMACRO)
cd ..\..
view thread (26+ messages) latest in thread
Message-ID: <20010702165702.A1161@christian.chrullrich.de>
Permalink: ../20010702165702.A1161@christian.chrullrich.de/
Also on: postgresql.org/message-id/20010702165702.A1161@christian.chrullrich.de
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-interfaces@postgresql.org
Cc: chris@chrullrich.de
Subject: Re: libpq++ on Windows
In-Reply-To: <20010702165702.A1161@christian.chrullrich.de>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox