*** src/interfaces/libpq/win32.mak.orig Tue May 6 04:31:40 2008 --- src/interfaces/libpq/win32.mak Sat Jun 28 01:35:01 2008 *************** *** 100,106 **** -@erase "$(INTDIR)\fe-secure.obj" -@erase "$(INTDIR)\pqexpbuffer.obj" -@erase "$(INTDIR)\pqsignal.obj" ! -@erase "$(OUTDIR)\win32.obj" -@erase "$(INTDIR)\wchar.obj" -@erase "$(INTDIR)\encnames.obj" -@erase "$(INTDIR)\pthread-win32.obj" --- 100,106 ---- -@erase "$(INTDIR)\fe-secure.obj" -@erase "$(INTDIR)\pqexpbuffer.obj" -@erase "$(INTDIR)\pqsignal.obj" ! -@erase "$(INTDIR)\win32.obj" -@erase "$(INTDIR)\wchar.obj" -@erase "$(INTDIR)\encnames.obj" -@erase "$(INTDIR)\pthread-win32.obj" *************** *** 110,115 **** --- 110,116 ---- -@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,156 **** --- 152,158 ---- "$(INTDIR)\dirmod.obj" \ "$(INTDIR)\pgsleep.obj" \ "$(INTDIR)\open.obj" \ + "$(INTDIR)\win32error.obj" \ "$(INTDIR)\pthread-win32.obj" *************** *** 220,228 **** $(LINK32_FLAGS) $(LINK32_OBJS) << # Inclusion of manifest ! !IF "$(_NMAKE_VER)" != "6.00.9782.0" mt -manifest $(OUTDIR)\$(OUTFILENAME).dll.manifest -outputresource:$(OUTDIR)\$(OUTFILENAME).dll;2 !ENDIF "$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c $(CPP) @<< --- 222,232 ---- $(LINK32_FLAGS) $(LINK32_OBJS) << # Inclusion of manifest ! !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) @<< *************** *** 303,308 **** --- 307,317 ---- "$(INTDIR)\open.obj" : ..\..\port\open.c $(CPP) @<< $(CPP_PROJ) /I"." ..\..\port\open.c + << + + "$(INTDIR)\win32error.obj" : ..\..\port\win32error.c + $(CPP) @<< + $(CPP_PROJ) /I"." ..\..\port\win32error.c << .c{$(CPP_OBJS)}.obj: