aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-12-04 22:26:46 +0000
committerBruce Momjian <bruce@momjian.us>2006-12-04 22:26:46 +0000
commitdfd4259e94395088e9c47b23fb7a3b63497faff1 (patch)
tree71cdc5923b1d659e7253226943b8f801a38799d0
parente1bfa1869f10f2445747239feb21882e8b56e0f1 (diff)
downloadpostgresql-dfd4259e94395088e9c47b23fb7a3b63497faff1.tar.gz
postgresql-dfd4259e94395088e9c47b23fb7a3b63497faff1.zip
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
-rw-r--r--src/bin/pg_dump/win32.mak9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/bin/pg_dump/win32.mak b/src/bin/pg_dump/win32.mak
index 5b4fce82cad..71f608bacd5 100644
--- 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