Commit bab13a70 authored by Tatsuo Ishii's avatar Tatsuo Ishii

Fix for Win32 making problem with MB enabled.

Patches created by Hiroki Kataoka.
parent 3cfd56fc
...@@ -37,6 +37,12 @@ CLEAN : ...@@ -37,6 +37,12 @@ CLEAN :
-@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\libpq.pch"
-@erase "$(OUTDIR)\libpqdll.exp" -@erase "$(OUTDIR)\libpqdll.exp"
-@erase "$(OUTDIR)\libpqdll.lib" -@erase "$(OUTDIR)\libpqdll.lib"
!IFDEF MULTIBYTE
-@erase "$(INTDIR)\common.obj"
-@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\conv.obj"
-@erase "$(INTDIR)\big5.obj"
!ENDIF
"$(OUTDIR)" : "$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
...@@ -67,7 +73,7 @@ LIB32_OBJS= \ ...@@ -67,7 +73,7 @@ LIB32_OBJS= \
"$(INTDIR)\fe-print.obj" "$(INTDIR)\fe-print.obj"
!IFDEF MULTIBYTE !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 !ENDIF
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
...@@ -105,6 +111,29 @@ LINK32_OBJS= \ ...@@ -105,6 +111,29 @@ LINK32_OBJS= \
<< <<
!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:: .c{$(CPP_OBJS)}.obj::
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) $< $(CPP_PROJ) $<
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment