summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2007-08-03 10:47:11 +0000
committerMagnus Hagander2007-08-03 10:47:11 +0000
commitd28444379ea24680a63255ac2bd2c6669698a05b (patch)
tree2e10847400677d102982755052f39d985ba1b0b5
parentbc2fb01c5611432158c0eb6eac347eccc1690b20 (diff)
Update supported standalone VC++ version to 7.1+ only, and fix
some bad data leftover in win32.mak. Per request from Hiroshi Saito.
-rw-r--r--doc/src/sgml/install-win32.sgml6
-rw-r--r--src/interfaces/libpq/win32.mak6
-rw-r--r--src/win32.mak2
3 files changed, 5 insertions, 9 deletions
diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index 8300cde1d3..aa759968ce 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -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 e4a22568fd..e7819d22d9 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 b114e743c0..8b46cf2a94 100644
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -1,6 +1,6 @@
# $PostgreSQL$
-# 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"