Commit 1808ce78 authored by Bruce Momjian's avatar Bruce Momjian

Try to get Borland CC to compile.

Backpatch to 8.0.X which doesn't work right now.
parent 32362502
...@@ -42,10 +42,12 @@ NULL=nul ...@@ -42,10 +42,12 @@ NULL=nul
DEBUG=1 DEBUG=1
OUTDIR=.\Debug OUTDIR=.\Debug
INTDIR=.\Debug INTDIR=.\Debug
!else !ELSE
OUTDIR=.\Release OUTDIR=.\Release
INTDIR=.\Release INTDIR=.\Release
!endif !ENDIF
OUTFILENAME=blibpq
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP; USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
...@@ -59,16 +61,48 @@ CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG ...@@ -59,16 +61,48 @@ CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
!endif !endif
CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\pgstrcasecmp.obj"
-@erase "$(INTDIR)\thread.obj"
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
-@erase "$(INTDIR)\noblock.obj"
-@erase "$(INTDIR)\md5.obj"
-@erase "$(INTDIR)\ip.obj"
-@erase "$(INTDIR)\fe-auth.obj"
-@erase "$(INTDIR)\fe-protocol2.obj"
-@erase "$(INTDIR)\fe-protocol3.obj"
-@erase "$(INTDIR)\fe-connect.obj"
-@erase "$(INTDIR)\fe-exec.obj"
-@erase "$(INTDIR)\fe-lobj.obj"
-@erase "$(INTDIR)\fe-misc.obj"
-@erase "$(INTDIR)\fe-print.obj"
-@erase "$(INTDIR)\fe-secure.obj"
-@erase "$(INTDIR)\pqexpbuffer.obj"
-@erase "$(INTDIR)\pqsignal.obj"
-@erase "$(OUTDIR)\libpqdll.obj"
-@erase "$(OUTDIR)\win32.obj"
-@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj"
-@erase "$(INTDIR)\pthread-win32.obj"
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(OUTDIR)\libpq.res"
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
-@erase "$(OUTDIR)\$(OUTFILENAME).tds"
-@erase "$(INTDIR)\pg_config_paths.h"
LIB32=tlib.exe LIB32=tlib.exe
LIB32_FLAGS= LIB32_FLAGS=
LIB32_OBJS= \ LIB32_OBJS= \
"$(OUTDIR)\win32.obj" \ "$(INTDIR)\win32.obj" \
"$(INTDIR)\getaddrinfo.obj" \ "$(INTDIR)\getaddrinfo.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\thread.obj" \ "$(INTDIR)\thread.obj" \
"$(INTDIR)\inet_aton.obj" \ "$(INTDIR)\inet_aton.obj" \
"$(INTDIR)\crypt.obj" \ "$(INTDIR)\crypt.obj" \
"$(INTDIR)\noblock.obj" \ "$(INTDIR)\noblock.obj" \
"$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\md5.obj" \ "$(INTDIR)\md5.obj" \
"$(INTDIR)\ip.obj" \ "$(INTDIR)\ip.obj" \
"$(INTDIR)\fe-auth.obj" \ "$(INTDIR)\fe-auth.obj" \
...@@ -83,7 +117,8 @@ LIB32_OBJS= \ ...@@ -83,7 +117,8 @@ LIB32_OBJS= \
"$(INTDIR)\pqexpbuffer.obj" \ "$(INTDIR)\pqexpbuffer.obj" \
"$(INTDIR)\pqsignal.obj" \ "$(INTDIR)\pqsignal.obj" \
"$(INTDIR)\wchar.obj" \ "$(INTDIR)\wchar.obj" \
"$(INTDIR)\encnames.obj" "$(INTDIR)\encnames.obj" \
"$(INTDIR)\pthread-win32.obj"
RSC=brcc32.exe RSC=brcc32.exe
...@@ -95,37 +130,6 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj" ...@@ -95,37 +130,6 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib" ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj"
-@erase "$(INTDIR)\thread.obj"
-@erase "$(INTDIR)\inet_aton.obj"
-@erase "$(INTDIR)\crypt.obj"
-@erase "$(INTDIR)\md5.obj"
-@erase "$(INTDIR)\ip.obj"
-@erase "$(INTDIR)\fe-auth.obj"
-@erase "$(INTDIR)\fe-protocol2.obj"
-@erase "$(INTDIR)\fe-protocol3.obj"
-@erase "$(INTDIR)\fe-connect.obj"
-@erase "$(INTDIR)\fe-exec.obj"
-@erase "$(INTDIR)\fe-lobj.obj"
-@erase "$(INTDIR)\fe-misc.obj"
-@erase "$(INTDIR)\fe-print.obj"
-@erase "$(INTDIR)\fe-secure.obj"
-@erase "$(INTDIR)\pqexpbuffer.obj"
-@erase "$(INTDIR)\pqsignal.obj"
-@erase "$(OUTDIR)\libpqdll.obj"
-@erase "$(OUTDIR)\win32.obj"
-@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj"
-@erase "$(INTDIR)\noblock.obj"
-@erase "$(INTDIR)\pgstrcasecmp.obj"
-@erase "$(OUTDIR)\libpq.res"
-@erase "$(OUTDIR)\blibpq.lib"
-@erase "$(OUTDIR)\blibpqdll.lib"
-@erase "$(OUTDIR)\blibpq.dll"
-@erase "$(OUTDIR)\blibpq.tds"
-@erase "$(INTDIR)\pg_config_paths.h"
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
......
...@@ -41,7 +41,7 @@ CPP_OBJS=.\Release/ ...@@ -41,7 +41,7 @@ CPP_OBJS=.\Release/
!ENDIF !ENDIF
ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
CLEAN : CLEAN :
-@erase "$(INTDIR)\getaddrinfo.obj" -@erase "$(INTDIR)\getaddrinfo.obj"
...@@ -65,16 +65,16 @@ CLEAN : ...@@ -65,16 +65,16 @@ CLEAN :
-@erase "$(INTDIR)\pqsignal.obj" -@erase "$(INTDIR)\pqsignal.obj"
-@erase "$(OUTDIR)\libpqdll.obj" -@erase "$(OUTDIR)\libpqdll.obj"
-@erase "$(OUTDIR)\win32.obj" -@erase "$(OUTDIR)\win32.obj"
-@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj"
-@erase "$(INTDIR)\pthread-win32.obj"
-@erase "$(OUTDIR)\$(OUTFILENAME).lib" -@erase "$(OUTDIR)\$(OUTFILENAME).lib"
-@erase "$(OUTDIR)\$(OUTFILENAME).dll" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(OUTDIR)\libpq.res" -@erase "$(OUTDIR)\libpq.res"
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
-@erase "*.pch" -@erase "*.pch"
-@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\libpq.pch"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-@erase "$(INTDIR)\wchar.obj"
-@erase "$(INTDIR)\encnames.obj"
-@erase "$(INTDIR)\pthread-win32.obj"
-@erase "$(INTDIR)\pg_config_paths.h" -@erase "$(INTDIR)\pg_config_paths.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment