diff options
| -rw-r--r-- | doc/src/sgml/install-win32.sgml | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 6 | ||||
| -rw-r--r-- | src/win32.mak | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml index f88e17aef32..9d96abeaa8d 100644 --- a/doc/src/sgml/install-win32.sgml +++ b/doc/src/sgml/install-win32.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.40 2007/04/18 13:50:08 mha Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.41 2007/08/03 10:47:10 mha Exp $ --> <chapter id="install-win32"> <title>Installation on <productname>Windows</productname></title> @@ -24,7 +24,7 @@ built for older versions of <productname>Windows</productname> using <productname>Cygwin</productname>. Finally, the client access library (<application>libpq</application>) can be built using - <productname>Visual C++ 6.0</productname> or + <productname>Visual C++ 7.1</productname> or <productname>Borland C++</productname> for compatibility with statically linked applications built using these tools. </para> @@ -360,7 +360,7 @@ <productname>Borland C++</productname></title> <para> - Using <productname>Visual C++ 6.0-8.0</productname> or + Using <productname>Visual C++ 7.1-8.0</productname> or <productname>Borland C++</productname> to build libpq is only recommended if you need a version with different debug/release flags, or if you need a static library to link into an application. For normal use the @@ -370,7 +370,7 @@ <para> To build the <application>libpq</application> client library using - <productname>Visual Studio 6.0 or later</productname>, change into the + <productname>Visual Studio 7.1 or later</productname>, change into the <filename>src</filename> directory and type the command <screen> <userinput>nmake /f win32.mak</userinput> diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index e4a22568fd6..e7819d22d9c 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -1,8 +1,4 @@ -<<<<<<< win32.mak -# Makefile for Microsoft Visual C++ 8.0 -======= -# Makefile for Microsoft Visual C++ 6.0-8.0 ->>>>>>> 1.45 +# Makefile for Microsoft Visual C++ 7.1-8.0 # Will build a static library libpq(d).lib # and a dynamic library libpq(d).dll with import library libpq(d)dll.lib diff --git a/src/win32.mak b/src/win32.mak index ba8569fcbd9..63f7e67631e 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -1,6 +1,6 @@ -# $PostgreSQL: pgsql/src/win32.mak,v 1.15 2007/03/05 14:18:38 mha Exp $ +# $PostgreSQL: pgsql/src/win32.mak,v 1.16 2007/08/03 10:47:10 mha Exp $ -# Top-file makefile for building Win32 libpq with Visual C++ 6.0. +# Top-file makefile for building Win32 libpq with Visual C++ 7.1. # (see src/tools/msvc for tools to build with Visual C++ 2005 and newer) !IF "$(OS)" == "Windows_NT" |