aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuo Ishii <ishii@postgresql.org>1999-08-16 02:04:05 +0000
committerTatsuo Ishii <ishii@postgresql.org>1999-08-16 02:04:05 +0000
commitbab13a70ff4e4cccd3744747d89c02e99c2968c4 (patch)
tree8f7abec2e7fc22914c5823ccabd4e2de55943f0f
parent3cfd56fcf68ee795b9386c2f23ef83ff532ba897 (diff)
downloadpostgresql-bab13a70ff4e4cccd3744747d89c02e99c2968c4.tar.gz
postgresql-bab13a70ff4e4cccd3744747d89c02e99c2968c4.zip
Fix for Win32 making problem with MB enabled.
Patches created by Hiroki Kataoka.
-rw-r--r--src/interfaces/libpq/win32.mak31
1 files changed, 30 insertions, 1 deletions
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 11023cc2cb6..1d351df7e8f 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -37,6 +37,12 @@ CLEAN :
-@erase "$(OUTDIR)\libpq.pch"
-@erase "$(OUTDIR)\libpqdll.exp"
-@erase "$(OUTDIR)\libpqdll.lib"
+!IFDEF MULTIBYTE
+ -@erase "$(INTDIR)\common.obj"
+ -@erase "$(INTDIR)\wchar.obj"
+ -@erase "$(INTDIR)\conv.obj"
+ -@erase "$(INTDIR)\big5.obj"
+!ENDIF
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -67,7 +73,7 @@ LIB32_OBJS= \
"$(INTDIR)\fe-print.obj"
!IFDEF MULTIBYTE
-LIB32_OBJS = $(LIB32_OBJS) $(INTDIR)\common.obj $(INTDIR)\wchar.obj $(INTDIR)\conv.obj
+LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\common.obj" "$(INTDIR)\wchar.obj" "$(INTDIR)\conv.obj" "$(INTDIR)\big5.obj"
!ENDIF
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
@@ -103,7 +109,30 @@ LINK32_OBJS= \
$(CPP) @<<
$(CPP_PROJ) ..\..\backend\lib\dllist.c
<<
+
+!IFDEF MULTIBYTE
+"$(INTDIR)\common.obj" : ..\..\backend\utils\mb\common.c
+ $(CPP) @<<
+ $(CPP_PROJ) /I "." ..\..\backend\utils\mb\common.c
+<<
+
+"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
+ $(CPP) @<<
+ $(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
+<<
+
+"$(INTDIR)\conv.obj" : ..\..\backend\utils\mb\conv.c
+ $(CPP) @<<
+ $(CPP_PROJ) /I "." ..\..\backend\utils\mb\conv.c
+<<
+
+"$(INTDIR)\big5.obj" : ..\..\backend\utils\mb\big5.c
+ $(CPP) @<<
+ $(CPP_PROJ) /I "." ..\..\backend\utils\mb\big5.c
+<<
+!ENDIF
+
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<