Skip to content

Commit bab13a7

Browse files
committed
Fix for Win32 making problem with MB enabled.
Patches created by Hiroki Kataoka.
1 parent 3cfd56f commit bab13a7

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

src/interfaces/libpq/win32.mak

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ CLEAN :
3737
-@erase "$(OUTDIR)\libpq.pch"
3838
-@erase "$(OUTDIR)\libpqdll.exp"
3939
-@erase "$(OUTDIR)\libpqdll.lib"
40+
!IFDEF MULTIBYTE
41+
-@erase "$(INTDIR)\common.obj"
42+
-@erase "$(INTDIR)\wchar.obj"
43+
-@erase "$(INTDIR)\conv.obj"
44+
-@erase "$(INTDIR)\big5.obj"
45+
!ENDIF
4046

4147
"$(OUTDIR)" :
4248
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -67,7 +73,7 @@ LIB32_OBJS= \
6773
"$(INTDIR)\fe-print.obj"
6874

6975
!IFDEF MULTIBYTE
70-
LIB32_OBJS = $(LIB32_OBJS) $(INTDIR)\common.obj $(INTDIR)\wchar.obj $(INTDIR)\conv.obj
76+
LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\common.obj" "$(INTDIR)\wchar.obj" "$(INTDIR)\conv.obj" "$(INTDIR)\big5.obj"
7177
!ENDIF
7278

7379
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
@@ -103,7 +109,30 @@ LINK32_OBJS= \
103109
$(CPP) @<<
104110
$(CPP_PROJ) ..\..\backend\lib\dllist.c
105111
<<
112+
106113

114+
!IFDEF MULTIBYTE
115+
"$(INTDIR)\common.obj" : ..\..\backend\utils\mb\common.c
116+
$(CPP) @<<
117+
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\common.c
118+
<<
119+
120+
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
121+
$(CPP) @<<
122+
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
123+
<<
124+
125+
"$(INTDIR)\conv.obj" : ..\..\backend\utils\mb\conv.c
126+
$(CPP) @<<
127+
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\conv.c
128+
<<
129+
130+
"$(INTDIR)\big5.obj" : ..\..\backend\utils\mb\big5.c
131+
$(CPP) @<<
132+
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\big5.c
133+
<<
134+
!ENDIF
135+
107136

108137
.c{$(CPP_OBJS)}.obj::
109138
$(CPP) @<<

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy