WIN32 + MB fix

From: Tatsuo Ishii <t-ishii(at)sra(dot)co(dot)jp>
To: pgsql-hackers(at)postgreSQL(dot)org
Subject: WIN32 + MB fix
Date: 1999-08-16 04:35:27
Message-ID: 199908160435.NAA21021@srapc451.sra.co.jp
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

I have committed following changes to both the current and the statble
tree. They should fix some problems when compiling libpq on Windows
with MB enabled, according to Hiroki Kataoka, the author of the
patches.
---
Tatsuo Ishii

----------------------------------------------------------------
diff -rc src.orig/interfaces/libpq/win32.mak src/interfaces/libpq/win32.mak
*** src.orig/interfaces/libpq/win32.mak Tue Jun 8 16:00:37 1999
--- src/interfaces/libpq/win32.mak Fri Jul 16 00:28:16 1999
***************
*** 37,42 ****
--- 37,48 ----
-(at)erase "$(OUTDIR)\libpq.pch"
-(at)erase "$(OUTDIR)\libpqdll.exp"
-(at)erase "$(OUTDIR)\libpqdll.lib"
+ !IFDEF MULTIBYTE
+ -(at)erase "$(INTDIR)\common.obj"
+ -(at)erase "$(INTDIR)\wchar.obj"
+ -(at)erase "$(INTDIR)\conv.obj"
+ -(at)erase "$(INTDIR)\big5.obj"
+ !ENDIF

"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
***************
*** 67,73 ****
"$(INTDIR)\fe-print.obj"

!IFDEF MULTIBYTE
! LIB32_OBJS = $(LIB32_OBJS) $(INTDIR)\common.obj $(INTDIR)\wchar.obj $(INTDIR)\conv.obj
!ENDIF

RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
--- 73,79 ----
"$(INTDIR)\fe-print.obj"

!IFDEF MULTIBYTE
! 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,110 ****
--- 109,139 ----
$(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) @<<
$(CPP_PROJ) $<

Browse pgsql-hackers by date

  From Date Subject
Next Message Thomas Lockhart 1999-08-16 06:15:40 Re: [CORE] Re: tomorrow
Previous Message The Hermit Hacker 1999-08-16 03:04:50 Re: [HACKERS] Re: [ANNOUNCE] New man pages