Remove compile errors of psql.exe and libpq.dll under

Multibyte mode.
This commit is contained in:
Hiroshi Inoue 2001-11-22 10:18:52 +00:00
parent ed19b9149a
commit 535d92877e
3 changed files with 19 additions and 1 deletions

View File

@ -32,6 +32,7 @@ CLEAN :
-@erase "$(INTDIR)\describe.obj" -@erase "$(INTDIR)\describe.obj"
-@erase "$(INTDIR)\tab-complete.obj" -@erase "$(INTDIR)\tab-complete.obj"
-@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\getopt.obj"
-@erase "$(INTDIR)\mbprint.obj"
-@erase "$(INTDIR)\vc50.idb" -@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\psql.exe" -@erase "$(OUTDIR)\psql.exe"
@ -73,6 +74,7 @@ LINK32_OBJS= \
"$(INTDIR)\describe.obj" \ "$(INTDIR)\describe.obj" \
"$(INTDIR)\tab-complete.obj" \ "$(INTDIR)\tab-complete.obj" \
"$(INTDIR)\getopt.obj" \ "$(INTDIR)\getopt.obj" \
"$(INTDIR)\mbprint.obj" \
"..\..\interfaces\libpq\Release\libpqdll.lib" "..\..\interfaces\libpq\Release\libpqdll.lib"
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

View File

@ -1,3 +1,5 @@
#ifndef pg_config_h_win32__
#define pg_config_h_win32__
/* /*
* Parts of pg_config.h that you get with autoconf on other systems * Parts of pg_config.h that you get with autoconf on other systems
*/ */
@ -23,3 +25,8 @@
#define HAVE_CXX_STRING_HEADER #define HAVE_CXX_STRING_HEADER
#define HAVE_NAMESPACE_STD #define HAVE_NAMESPACE_STD
/* use _snprintf instead of snprintf */
#define HAVE_SNPRINTF_DECL
#define snprintf _snprintf
#endif /* pg_config_h_win32__ */

View File

@ -73,6 +73,7 @@ CLEAN :
-@erase "$(OUTDIR)\libpqdll.lib" -@erase "$(OUTDIR)\libpqdll.lib"
!IFDEF MULTIBYTE !IFDEF MULTIBYTE
-@erase "$(INTDIR)\wchar.obj" -@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj"
!ENDIF !ENDIF
"$(OUTDIR)" : "$(OUTDIR)" :
@ -106,7 +107,7 @@ LIB32_OBJS= \
"$(INTDIR)\pqexpbuffer.obj" "$(INTDIR)\pqexpbuffer.obj"
!IFDEF MULTIBYTE !IFDEF MULTIBYTE
LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\wchar.obj" LIB32_OBJS = $(LIB32_OBJS) "$(INTDIR)\wchar.obj" "$(INTDIR)\encnames.obj"
!ENDIF !ENDIF
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
@ -158,6 +159,14 @@ LINK32_OBJS= \
!ENDIF !ENDIF
!IFDEF MULTIBYTE
"$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
$(CPP) @<<
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:: .c{$(CPP_OBJS)}.obj::
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) $< $(CPP_PROJ) $<