Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f6c1dec

Browse files
committed
Fix standalone libpq build on win32.
Hiroshi Saito
1 parent 2c2161a commit f6c1dec

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/interfaces/libpq/win32.mak

+11-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ CLEAN :
100100
-@erase "$(INTDIR)\fe-secure.obj"
101101
-@erase "$(INTDIR)\pqexpbuffer.obj"
102102
-@erase "$(INTDIR)\pqsignal.obj"
103-
-@erase "$(OUTDIR)\win32.obj"
103+
-@erase "$(INTDIR)\win32.obj"
104104
-@erase "$(INTDIR)\wchar.obj"
105105
-@erase "$(INTDIR)\encnames.obj"
106106
-@erase "$(INTDIR)\pthread-win32.obj"
@@ -110,6 +110,7 @@ CLEAN :
110110
-@erase "$(INTDIR)\dirmod.obj"
111111
-@erase "$(INTDIR)\pgsleep.obj"
112112
-@erase "$(INTDIR)\open.obj"
113+
-@erase "$(INTDIR)\win32error.obj"
113114
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
114115
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
115116
-@erase "$(OUTDIR)\libpq.res"
@@ -151,6 +152,7 @@ LIB32_OBJS= \
151152
"$(INTDIR)\dirmod.obj" \
152153
"$(INTDIR)\pgsleep.obj" \
153154
"$(INTDIR)\open.obj" \
155+
"$(INTDIR)\win32error.obj" \
154156
"$(INTDIR)\pthread-win32.obj"
155157

156158

@@ -220,9 +222,11 @@ LINK32_OBJS= \
220222
$(LINK32_FLAGS) $(LINK32_OBJS)
221223
<<
222224
# Inclusion of manifest
223-
!IF "$(_NMAKE_VER)" != "6.00.9782.0"
225+
!IF "$(_NMAKE_VER)" != "6.00.8168.0" && "$(_NMAKE_VER)" != "7.00.9466"
226+
!IF "$(_NMAKE_VER)" != "6.00.9782.0" && "$(_NMAKE_VER)" != "7.10.3077"
224227
mt -manifest $(OUTDIR)\$(OUTFILENAME).dll.manifest -outputresource:$(OUTDIR)\$(OUTFILENAME).dll;2
225228
!ENDIF
229+
!ENDIF
226230

227231
"$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
228232
$(CPP) @<<
@@ -305,6 +309,11 @@ LINK32_OBJS= \
305309
$(CPP_PROJ) /I"." ..\..\port\open.c
306310
<<
307311

312+
"$(INTDIR)\win32error.obj" : ..\..\port\win32error.c
313+
$(CPP) @<<
314+
$(CPP_PROJ) /I"." ..\..\port\win32error.c
315+
<<
316+
308317
.c{$(CPP_OBJS)}.obj:
309318
$(CPP) $(CPP_PROJ) $<
310319

0 commit comments

Comments
 (0)