diff options
| author | Bruce Momjian | 2006-10-10 21:31:44 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2006-10-10 21:31:44 +0000 |
| commit | 58c04c67637786cb18eaa6068519db50d4fdb1f1 (patch) | |
| tree | 874a8e85f89851e13bba6549d678118f39f35e0a | |
| parent | 5e46b9d516bcddb132bf6cc6bc70b77344e34b06 (diff) | |
MSVC/BCC Win32 compiler fixes.
Hiroshi Saito
| -rw-r--r-- | src/bin/pg_config/win32.mak | 11 | ||||
| -rw-r--r-- | src/bin/pg_dump/win32.mak | 9 | ||||
| -rw-r--r-- | src/bin/psql/win32.mak | 7 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 4 |
4 files changed, 28 insertions, 3 deletions
diff --git a/src/bin/pg_config/win32.mak b/src/bin/pg_config/win32.mak index 25b3f58cb3..98b2e70ccb 100644 --- a/src/bin/pg_config/win32.mak +++ b/src/bin/pg_config/win32.mak @@ -26,6 +26,11 @@ ALL : "..\..\port\pg_config_paths.h" "$(OUTDIR)\pg_config.exe" CLEAN : -@erase "$(INTDIR)\pg_config.obj" + -@erase "$(INTDIR)\pgstrcasecmp.obj" + -@erase "$(OUTDIR)\path.obj" + -@erase "$(OUTDIR)\strlcpy.obj" + -@erase "$(INTDIR)\exec.obj" + -@erase "$(INTDIR)\snprintf.obj" -@erase "$(OUTDIR)\pg_config.exe" -@erase "$(INTDIR)\..\..\port\pg_config_paths.h" @@ -63,6 +68,7 @@ LINK32_OBJS= \ "$(INTDIR)\pg_config.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \ "$(OUTDIR)\path.obj" \ + "$(OUTDIR)\strlcpy.obj" \ "$(INTDIR)\exec.obj" \ "$(INTDIR)\snprintf.obj" \ !IFDEF DEBUG @@ -81,6 +87,11 @@ LINK32_OBJS= \ $(CPP_PROJ) ..\..\port\path.c << +"$(OUTDIR)\strlcpy.obj" : "$(OUTDIR)" ..\..\port\strlcpy.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\strlcpy.c +<< + "$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c $(CPP) @<< $(CPP_PROJ) ..\..\port\pgstrcasecmp.c diff --git a/src/bin/pg_dump/win32.mak b/src/bin/pg_dump/win32.mak index 7ced2b09c5..695a7ce057 100644 --- a/src/bin/pg_dump/win32.mak +++ b/src/bin/pg_dump/win32.mak @@ -55,10 +55,11 @@ CLEAN : -@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\getopt_long.obj" -@erase "$(INTDIR)\path.obj" + -@erase "$(INTDIR)\strlcpy.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj" -@erase "$(INTDIR)\sprompt.obj" -@erase "$(INTDIR)\snprintf.obj" - -@erase "$(INTDIR)\pg_dump.pch" +# -@erase "$(INTDIR)\pg_dump.pch" -@erase "$(OUTDIR)\pg_dump.obj" -@erase "$(OUTDIR)\pg_dump.exe" -@erase "$(INTDIR)\pg_dumpall.obj" @@ -93,6 +94,7 @@ LINK32_OBJS= \ "$(INTDIR)\getopt.obj" \ "$(INTDIR)\getopt_long.obj" \ "$(INTDIR)\path.obj" \ + "$(INTDIR)\strlcpy.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \ "$(INTDIR)\sprompt.obj" \ "$(INTDIR)\snprintf.obj" @@ -166,6 +168,11 @@ LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib" $(CPP_PROJ) ..\..\port\path.c << +"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\strlcpy.c +<< + "$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c $(CPP) @<< $(CPP_PROJ) ..\..\port\pgstrcasecmp.c diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak index 3e500f7290..2d88c51acb 100644 --- a/src/bin/psql/win32.mak +++ b/src/bin/psql/win32.mak @@ -59,6 +59,7 @@ CLEAN : -@erase "$(INTDIR)\getopt_long.obj" -@erase "$(INTDIR)\snprintf.obj" -@erase "$(INTDIR)\path.obj" + -@erase "$(INTDIR)\strlcpy.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj" -@erase "$(INTDIR)\sprompt.obj" -@erase "$(INTDIR)\dumputils.obj" @@ -94,6 +95,7 @@ LINK32_OBJS= \ "$(INTDIR)\getopt_long.obj" \ "$(INTDIR)\snprintf.obj" \ "$(INTDIR)\path.obj" \ + "$(INTDIR)\strlcpy.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \ "$(INTDIR)\sprompt.obj" \ "$(INTDIR)\dumputils.obj" \ @@ -151,6 +153,11 @@ LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib" $(CPP_PROJ) ..\..\port\path.c << +"$(INTDIR)\strlcpy.obj" : "$(INTDIR)" ..\..\port\strlcpy.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\strlcpy.c +<< + "$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c $(CPP) @<< $(CPP_PROJ) ..\..\port\pgstrcasecmp.c diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 9ced9c8144..c53797ef0c 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -74,8 +74,8 @@ CLEAN : -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" -@erase "$(OUTDIR)\libpq.res" -@erase "$(OUTDIR)\$(OUTFILENAME).dll" - -@erase "*.pch" - -@erase "$(OUTDIR)\libpq.pch" +# -@erase "*.pch" +# -@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp" -@erase "$(INTDIR)\pg_config_paths.h" |