From f6c1dece9aa86fabe47fec9e778cee05c6fc6407 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Fri, 27 Jun 2008 18:58:14 +0000
Subject: [PATCH] Fix standalone libpq build on win32.
Hiroshi Saito
---
src/interfaces/libpq/win32.mak | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index abe90cea134..ebf327b730c 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -100,7 +100,7 @@ CLEAN :
-@erase "$(INTDIR)\fe-secure.obj"
-@erase "$(INTDIR)\pqexpbuffer.obj"
-@erase "$(INTDIR)\pqsignal.obj"
- -@erase "$(OUTDIR)\win32.obj"
+ -@erase "$(INTDIR)\win32.obj"
-@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj"
-@erase "$(INTDIR)\pthread-win32.obj"
@@ -110,6 +110,7 @@ CLEAN :
-@erase "$(INTDIR)\dirmod.obj"
-@erase "$(INTDIR)\pgsleep.obj"
-@erase "$(INTDIR)\open.obj"
+ -@erase "$(INTDIR)\win32error.obj"
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(OUTDIR)\libpq.res"
@@ -151,6 +152,7 @@ LIB32_OBJS= \
"$(INTDIR)\dirmod.obj" \
"$(INTDIR)\pgsleep.obj" \
"$(INTDIR)\open.obj" \
+ "$(INTDIR)\win32error.obj" \
"$(INTDIR)\pthread-win32.obj"
@@ -220,9 +222,11 @@ LINK32_OBJS= \
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
# Inclusion of manifest
-!IF "$(_NMAKE_VER)" != "6.00.9782.0"
+!IF "$(_NMAKE_VER)" != "6.00.8168.0" && "$(_NMAKE_VER)" != "7.00.9466"
+!IF "$(_NMAKE_VER)" != "6.00.9782.0" && "$(_NMAKE_VER)" != "7.10.3077"
mt -manifest $(OUTDIR)\$(OUTFILENAME).dll.manifest -outputresource:$(OUTDIR)\$(OUTFILENAME).dll;2
!ENDIF
+!ENDIF
"$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
$(CPP) @<<
@@ -305,6 +309,11 @@ LINK32_OBJS= \
$(CPP_PROJ) /I"." ..\..\port\open.c
<<
+"$(INTDIR)\win32error.obj" : ..\..\port\win32error.c
+ $(CPP) @<<
+ $(CPP_PROJ) /I"." ..\..\port\win32error.c
+<<
+
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
--
GitLab