Skip to content

Commit 1808ce7

Browse files
bmomjianbmomjian
committed
Try to get Borland CC to compile.
Backpatch to 8.0.X which doesn't work right now.
1 parent 3236250 commit 1808ce7

File tree

2 files changed

+46
-42
lines changed

2 files changed

+46
-42
lines changed

‎src/interfaces/libpq/bcc32.mak

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ NULL=nul
4242
DEBUG=1
4343
OUTDIR=.\Debug
4444
INTDIR=.\Debug
45-
!else
45+
!ELSE
4646
OUTDIR=.\Release
4747
INTDIR=.\Release
48-
!endif
48+
!ENDIF
49+
50+
OUTFILENAME=blibpq
4951

5052
USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
5153

@@ -59,16 +61,48 @@ CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
5961
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
6062
!endif
6163

64+
CLEAN :
65+
-@erase "$(INTDIR)\getaddrinfo.obj"
66+
-@erase "$(INTDIR)\pgstrcasecmp.obj"
67+
-@erase "$(INTDIR)\thread.obj"
68+
-@erase "$(INTDIR)\inet_aton.obj"
69+
-@erase "$(INTDIR)\crypt.obj"
70+
-@erase "$(INTDIR)\noblock.obj"
71+
-@erase "$(INTDIR)\md5.obj"
72+
-@erase "$(INTDIR)\ip.obj"
73+
-@erase "$(INTDIR)\fe-auth.obj"
74+
-@erase "$(INTDIR)\fe-protocol2.obj"
75+
-@erase "$(INTDIR)\fe-protocol3.obj"
76+
-@erase "$(INTDIR)\fe-connect.obj"
77+
-@erase "$(INTDIR)\fe-exec.obj"
78+
-@erase "$(INTDIR)\fe-lobj.obj"
79+
-@erase "$(INTDIR)\fe-misc.obj"
80+
-@erase "$(INTDIR)\fe-print.obj"
81+
-@erase "$(INTDIR)\fe-secure.obj"
82+
-@erase "$(INTDIR)\pqexpbuffer.obj"
83+
-@erase "$(INTDIR)\pqsignal.obj"
84+
-@erase "$(OUTDIR)\libpqdll.obj"
85+
-@erase "$(OUTDIR)\win32.obj"
86+
-@erase "$(INTDIR)\wchar.obj"
87+
-@erase "$(INTDIR)\encnames.obj"
88+
-@erase "$(INTDIR)\pthread-win32.obj"
89+
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
90+
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
91+
-@erase "$(OUTDIR)\libpq.res"
92+
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
93+
-@erase "$(OUTDIR)\$(OUTFILENAME).tds"
94+
-@erase "$(INTDIR)\pg_config_paths.h"
95+
6296
LIB32=tlib.exe
6397
LIB32_FLAGS=
6498
LIB32_OBJS= \
65-
"$(OUTDIR)\win32.obj" \
99+
"$(INTDIR)\win32.obj" \
66100
"$(INTDIR)\getaddrinfo.obj" \
101+
"$(INTDIR)\pgstrcasecmp.obj" \
67102
"$(INTDIR)\thread.obj" \
68103
"$(INTDIR)\inet_aton.obj" \
69104
"$(INTDIR)\crypt.obj" \
70105
"$(INTDIR)\noblock.obj" \
71-
"$(INTDIR)\pgstrcasecmp.obj" \
72106
"$(INTDIR)\md5.obj" \
73107
"$(INTDIR)\ip.obj" \
74108
"$(INTDIR)\fe-auth.obj" \
@@ -83,7 +117,8 @@ LIB32_OBJS= \
83117
"$(INTDIR)\pqexpbuffer.obj" \
84118
"$(INTDIR)\pqsignal.obj" \
85119
"$(INTDIR)\wchar.obj" \
86-
"$(INTDIR)\encnames.obj"
120+
"$(INTDIR)\encnames.obj" \
121+
"$(INTDIR)\pthread-win32.obj"
87122

88123

89124
RSC=brcc32.exe
@@ -95,37 +130,6 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
95130

96131
ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
97132

98-
CLEAN :
99-
-@erase "$(INTDIR)\getaddrinfo.obj"
100-
-@erase "$(INTDIR)\thread.obj"
101-
-@erase "$(INTDIR)\inet_aton.obj"
102-
-@erase "$(INTDIR)\crypt.obj"
103-
-@erase "$(INTDIR)\md5.obj"
104-
-@erase "$(INTDIR)\ip.obj"
105-
-@erase "$(INTDIR)\fe-auth.obj"
106-
-@erase "$(INTDIR)\fe-protocol2.obj"
107-
-@erase "$(INTDIR)\fe-protocol3.obj"
108-
-@erase "$(INTDIR)\fe-connect.obj"
109-
-@erase "$(INTDIR)\fe-exec.obj"
110-
-@erase "$(INTDIR)\fe-lobj.obj"
111-
-@erase "$(INTDIR)\fe-misc.obj"
112-
-@erase "$(INTDIR)\fe-print.obj"
113-
-@erase "$(INTDIR)\fe-secure.obj"
114-
-@erase "$(INTDIR)\pqexpbuffer.obj"
115-
-@erase "$(INTDIR)\pqsignal.obj"
116-
-@erase "$(OUTDIR)\libpqdll.obj"
117-
-@erase "$(OUTDIR)\win32.obj"
118-
-@erase "$(INTDIR)\wchar.obj"
119-
-@erase "$(INTDIR)\encnames.obj"
120-
-@erase "$(INTDIR)\noblock.obj"
121-
-@erase "$(INTDIR)\pgstrcasecmp.obj"
122-
-@erase "$(OUTDIR)\libpq.res"
123-
-@erase "$(OUTDIR)\blibpq.lib"
124-
-@erase "$(OUTDIR)\blibpqdll.lib"
125-
-@erase "$(OUTDIR)\blibpq.dll"
126-
-@erase "$(OUTDIR)\blibpq.tds"
127-
-@erase "$(INTDIR)\pg_config_paths.h"
128-
129133
config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
130134

131135
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32

‎src/interfaces/libpq/win32.mak

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ CPP_OBJS=.\Release/
4141
!ENDIF
4242

4343

44-
ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
44+
ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
4545

4646
CLEAN :
4747
-@erase "$(INTDIR)\getaddrinfo.obj"
@@ -65,16 +65,16 @@ CLEAN :
6565
-@erase "$(INTDIR)\pqsignal.obj"
6666
-@erase "$(OUTDIR)\libpqdll.obj"
6767
-@erase "$(OUTDIR)\win32.obj"
68+
-@erase "$(INTDIR)\wchar.obj"
69+
-@erase "$(INTDIR)\encnames.obj"
70+
-@erase "$(INTDIR)\pthread-win32.obj"
6871
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
69-
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
72+
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
7073
-@erase "$(OUTDIR)\libpq.res"
74+
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
7175
-@erase "*.pch"
7276
-@erase "$(OUTDIR)\libpq.pch"
7377
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
74-
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
75-
-@erase "$(INTDIR)\wchar.obj"
76-
-@erase "$(INTDIR)\encnames.obj"
77-
-@erase "$(INTDIR)\pthread-win32.obj"
7878
-@erase "$(INTDIR)\pg_config_paths.h"
7979

8080

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy