diff options
| author | Bruce Momjian <bruce@momjian.us> | 2007-01-11 02:42:31 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2007-01-11 02:42:31 +0000 |
| commit | a5ec2ec77abeb887402451e4fe34a2b54954bc56 (patch) | |
| tree | 17329a7c27c6230fc08d817a3bc64d279bfe2afa /src/interfaces | |
| parent | 945d0b4b09624db3bfa7b3e91c0625cf6a6b72b2 (diff) | |
| download | postgresql-a5ec2ec77abeb887402451e4fe34a2b54954bc56.tar.gz | |
Allow Borland CC to compile libpq and psql.
Backpatch to 8.2.X.
L Bayuk
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/bcc32.mak | 24 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.mak | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak index 30e25a29ab..992bb5b68e 100644 --- a/src/interfaces/libpq/bcc32.mak +++ b/src/interfaces/libpq/bcc32.mak @@ -76,7 +76,6 @@ ALL : config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib" CLEAN : -@erase "$(INTDIR)\getaddrinfo.obj" -@erase "$(INTDIR)\pgstrcasecmp.obj" - -@erase "$(INTDIR)\strlcpy.obj" -@erase "$(INTDIR)\thread.obj" -@erase "$(INTDIR)\inet_aton.obj" -@erase "$(INTDIR)\crypt.obj" @@ -99,6 +98,8 @@ CLEAN : -@erase "$(INTDIR)\wchar.obj" -@erase "$(INTDIR)\encnames.obj" -@erase "$(INTDIR)\pthread-win32.obj" + -@erase "$(INTDIR)\snprintf.obj" + -@erase "$(INTDIR)\strlcpy.obj" -@erase "$(OUTDIR)\$(OUTFILENAME).lib" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" -@erase "$(OUTDIR)\libpq.res" @@ -113,7 +114,6 @@ LIB32_OBJS= \ "$(INTDIR)\win32.obj" \ "$(INTDIR)\getaddrinfo.obj" \ "$(INTDIR)\pgstrcasecmp.obj" \ - "$(INTDIR)\strlcpy.obj" \ "$(INTDIR)\thread.obj" \ "$(INTDIR)\inet_aton.obj" \ "$(INTDIR)\crypt.obj" \ @@ -133,6 +133,8 @@ LIB32_OBJS= \ "$(INTDIR)\pqsignal.obj" \ "$(INTDIR)\wchar.obj" \ "$(INTDIR)\encnames.obj" \ + "$(INTDIR)\snprintf.obj" \ + "$(INTDIR)\strlcpy.obj" \ "$(INTDIR)\pthread-win32.obj" @@ -162,7 +164,7 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj" $(LINK32_FLAGS) + c0d32.obj $(LINK32_OBJS), + $@,, + - "$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, + + "$(OUTDIR)\blibpq.lib" import32.lib cw32mt.lib, + blibpqdll.def,"$(INTDIR)\libpq.res" << implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@ @@ -187,11 +189,6 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj" $(CPP_PROJ) ..\..\port\pgstrcasecmp.c << -"$(INTDIR)\strlcpy.obj" : ..\..\port\strlcpy.c - $(CPP) @<< - $(CPP_PROJ) ..\..\port\strlcpy.c -<< - "$(INTDIR)\thread.obj" : ..\..\port\thread.c $(CPP) @<< $(CPP_PROJ) ..\..\port\thread.c @@ -233,5 +230,16 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj" $(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c << +"$(INTDIR)\snprintf.obj" : ..\..\port\snprintf.c + $(CPP) @<< + $(CPP_PROJ) /I"." ..\..\port\snprintf.c +<< + +"$(INTDIR)\strlcpy.obj" : ..\..\port\strlcpy.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\strlcpy.c +<< + + .c.obj: $(CPP) $(CPP_PROJ) $< diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 0fd56eb174..ca5f4326aa 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -74,8 +74,6 @@ CLEAN : -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" -@erase "$(OUTDIR)\libpq.res" -@erase "$(OUTDIR)\$(OUTFILENAME).dll" -# -@erase "*.pch" -# -@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp" -@erase "$(INTDIR)\pg_config_paths.h" |