From 09e98a3e170ecdeb25a0e1afe81bdbeeeaf21f48 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 14 Sep 2011 17:57:32 +0300
Subject: [PATCH] Teach the makefile used to build stand-alone libpq on Windows
that libpq needs win32setlocale.c now. The cygwin and MSVC build scripts were
changed earlier, but this was neglected. This should fix bug report #6203 by
Steve.
---
src/interfaces/libpq/win32.mak | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index fd778d0e255..70a741a5f41 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -87,8 +87,8 @@ CLEAN :
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
-@erase "$(INTDIR)\noblock.obj"
- -@erase "$(INTDIR)\chklocale.obj"
- -@erase "$(INTDIR)\inet_net_ntop.obj"
+ -@erase "$(INTDIR)\chklocale.obj"
+ -@erase "$(INTDIR)\inet_net_ntop.obj"
-@erase "$(INTDIR)\md5.obj"
-@erase "$(INTDIR)\ip.obj"
-@erase "$(INTDIR)\fe-auth.obj"
@@ -114,6 +114,7 @@ CLEAN :
-@erase "$(INTDIR)\pgsleep.obj"
-@erase "$(INTDIR)\open.obj"
-@erase "$(INTDIR)\win32error.obj"
+ -@erase "$(INTDIR)\win32setlocale.obj"
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(OUTDIR)\libpq.res"
@@ -159,6 +160,7 @@ LIB32_OBJS= \
"$(INTDIR)\pgsleep.obj" \
"$(INTDIR)\open.obj" \
"$(INTDIR)\win32error.obj" \
+ "$(INTDIR)\win32setlocale.obj" \
"$(INTDIR)\pthread-win32.obj"
@@ -330,6 +332,11 @@ LINK32_OBJS= \
$(CPP_PROJ) /I"." ..\..\port\win32error.c
<<
+"$(INTDIR)\win32setlocale.obj" : ..\..\port\win32setlocale.c
+ $(CPP) @<<
+ $(CPP_PROJ) /I"." ..\..\port\win32setlocale.c
+<<
+
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
--
GitLab