summaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/win32.mak
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-10-06 03:02:29 +0000
committerBruce Momjian <bruce@momjian.us>1998-10-06 03:02:29 +0000
commite1ebac319d1491e54dd8e3e457d48aa766771366 (patch)
tree48a57b8f779c2b8a1d68ef953f4b173168d5c3a6 /src/interfaces/libpq/win32.mak
parentc77a29a14efe69851a087989e3520ed560fa8862 (diff)
downloadpostgresql-e1ebac319d1491e54dd8e3e457d48aa766771366.tar.gz
Here are the patches against the current source tree. I have run the
regression test on a FreeBSD box with both non-MULTIBYTE and MULTIBYTE-enabled, and confirmed that the results are same. However I do not tested on PCs(I don't have access to win). Please let me know if the patches break anything on PCs. Also please note that the patch for varchar.c is a fix for a nasty bug of char(n) types that I introduced and I believe at least this should be applied. Tatsuo Ishii
Diffstat (limited to 'src/interfaces/libpq/win32.mak')
-rw-r--r--src/interfaces/libpq/win32.mak14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 71d57dc464..7260f977ab 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -33,7 +33,7 @@ CLEAN :
-@erase "$(OUTDIR)\libpq.lib"
-@erase "$(OUTDIR)\libpq.dll"
-@erase "$(OUTDIR)\libpq.res"
- -@erase "$(OUTDIR)\vc*.*"
+ -@erase "vc50.pch"
-@erase "$(OUTDIR)\libpq.pch"
-@erase "$(OUTDIR)\libpqdll.exp"
-@erase "$(OUTDIR)\libpqdll.lib"
@@ -44,6 +44,14 @@ CLEAN :
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+!IFDEF MULTIBYTE
+!IFNDEF MBFLAGS
+MBFLAGS="-DMULTIBYTE=$(MULTIBYTE)"
+!ENDIF
+CPP_PROJ = $(CPP_PROJ) $(MBFLAGS)
+!ENDIF
+
CPP_OBJS=.\Release/
CPP_SBRS=.
@@ -58,6 +66,10 @@ LIB32_OBJS= \
"$(INTDIR)\fe-misc.obj" \
"$(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"
LINK32=link.exe