Fix pg_dump linking on Win32 with MSVS win32.mak:

The module link is insufficient.:-(

---- Sorry, japanese message change to xxx ---
link.exe @C:\DOCUME~1\hi-saito\LOCALS~1\Temp\nmk03360.
common.obj : error LNK2001: xxxxxx "_pg_qsort" xxxxxx
pg_dump_sort.obj : error LNK2001: xxxxx "_pg_qsort" xxxxx
.\Release\pg_dump.exe : fatal error LNK1120: xxxxxxx
NMAKE : fatal error U1077: 'link.exe' : xxxxx '0x460'
Stop.

Hiroshi Saito

diff --git a/src/bin/pg_dump/win32.mak b/src/bin/pg_dump/win32.mak
index 5b4fce82cad3d408f7c850a1bb9dc175b8376d72..71f608bacd5a416685271b03e36e0563f50b654b 100644 (file)
--- a/src/bin/pg_dump/win32.mak
+++ b/src/bin/pg_dump/win32.mak
@@ -59,6 +59,7 @@ CLEAN :
    -@erase "$(INTDIR)\pgstrcasecmp.obj"
    -@erase "$(INTDIR)\sprompt.obj"
    -@erase "$(INTDIR)\snprintf.obj"
+   -@erase "$(INTDIR)\qsort.obj"
 #  -@erase "$(INTDIR)\pg_dump.pch"
    -@erase "$(OUTDIR)\pg_dump.obj"
    -@erase "$(OUTDIR)\pg_dump.exe"
@@ -97,7 +98,8 @@ LINK32_OBJS= \
    "$(INTDIR)\strlcpy.obj" \
    "$(INTDIR)\pgstrcasecmp.obj" \
    "$(INTDIR)\sprompt.obj" \
-   "$(INTDIR)\snprintf.obj"
+   "$(INTDIR)\snprintf.obj" \
+   "$(INTDIR)\qsort.obj"
 
 LINK32_OBJS_DMP= \
    "$(INTDIR)\common.obj" \
@@ -188,6 +190,11 @@ LINK32_OBJS    = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
     $(CPP_PROJ) ..\..\port\snprintf.c
 <<
 
+"$(INTDIR)\qsort.obj" : "$(INTDIR)" ..\..\port\qsort.c
+    $(CPP) @<<
+    $(CPP_PROJ) ..\..\port\qsort.c
+<<
+
 ..\..\backend\parser\parse.h : ..\..\backend\parser\gram.y
    $(YACC) -y -d  ..\..\backend\parser\gram.y
    $(MV) ..\..\backend\parser\y.tab.h ..\..\backend\parser\parse.h