🌐 AI搜索 & 代理 主页
Skip to content

Commit 1881c8f

Browse files
bmomjianbmomjian
committed
Add new Win32 file with adjustments for recent code changes.
Andreas Pflug
1 parent 6870843 commit 1881c8f

File tree

1 file changed

+34
-26
lines changed

1 file changed

+34
-26
lines changed

‎src/interfaces/libpq/win32.mak‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Makefile for Microsoft Visual C++ 5.0 (or compat)
22

3-
# Will build a Win32 static library libpq(d).lib
4-
# and a Win32 dynamic library libpq(d).dll with import library libpq(d)dll.lib
3+
# Will build a Win32 static library libpq(d).lib
4+
# and a Win32 dynamic library libpq(d).dll with import library libpq(d)dll.lib
55
# USE_SSL=1 will compile with OpenSSL
66
# DEBUG=1 compiles with debugging symbols
77

@@ -10,15 +10,15 @@
1010
!MESSAGE
1111

1212
!IFDEF DEBUG
13-
OPT=/Od /Zi /MDd
14-
LOPT=/debug
13+
OPT=/Od /Zi /MDd
14+
LOPT=/DEBUG
1515
DEBUGDEF=/D _DEBUG
16-
OUTFILENAME=libpqd
16+
OUTFILENAME=libpqd
1717
!ELSE
18-
OPT=/O2 /MD
18+
OPT=/O2 /MD
1919
LOPT=
2020
DEBUGDEF=/D NDEBUG
21-
OUTFILENAME=libpq
21+
OUTFILENAME=libpq
2222
!ENDIF
2323

2424
!IF "$(OS)" == "Windows_NT"
@@ -41,15 +41,15 @@ CPP_OBJS=.\Release/
4141
!ENDIF
4242

4343

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

4646
CLEAN :
4747
-@erase "$(INTDIR)\getaddrinfo.obj"
48+
-@erase "$(INTDIR)\pgstrcasecmp.obj"
4849
-@erase "$(INTDIR)\thread.obj"
4950
-@erase "$(INTDIR)\inet_aton.obj"
5051
-@erase "$(INTDIR)\crypt.obj"
5152
-@erase "$(INTDIR)\noblock.obj"
52-
-@erase "$(INTDIR)\path.obj"
5353
-@erase "$(INTDIR)\dllist.obj"
5454
-@erase "$(INTDIR)\md5.obj"
5555
-@erase "$(INTDIR)\ip.obj"
@@ -65,20 +65,28 @@ CLEAN :
6565
-@erase "$(INTDIR)\pqexpbuffer.obj"
6666
-@erase "$(OUTDIR)\libpqdll.obj"
6767
-@erase "$(OUTDIR)\win32.obj"
68-
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
69-
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
68+
-@erase "$(OUTDIR)\$(OUTFILENAME).lib"
69+
-@erase "$(OUTDIR)\$(OUTFILENAME).dll"
7070
-@erase "$(OUTDIR)\libpq.res"
7171
-@erase "*.pch"
7272
-@erase "$(OUTDIR)\libpq.pch"
73-
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
74-
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
73+
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
74+
-@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
7575
-@erase "$(INTDIR)\wchar.obj"
7676
-@erase "$(INTDIR)\encnames.obj"
7777

78+
79+
80+
config: ..\..\include\pg_config.h
81+
82+
..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
83+
copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
84+
85+
7886
"$(OUTDIR)" :
7987
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
8088

81-
CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /D "FRONTEND" $(DEBUGDEF) /D\
89+
CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /D "FRONTEND" $(DEBUGDEF) /D\
8290
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
8391
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
8492

@@ -90,15 +98,15 @@ SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib
9098
CPP_SBRS=.
9199

92100
LIB32=link.exe -lib
93-
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib"
101+
LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib"
94102
LIB32_OBJS= \
95103
"$(INTDIR)\win32.obj" \
96104
"$(INTDIR)\getaddrinfo.obj" \
105+
"$(INTDIR)\pgstrcasecmp.obj" \
97106
"$(INTDIR)\thread.obj" \
98107
"$(INTDIR)\inet_aton.obj" \
99108
"$(INTDIR)\crypt.obj" \
100109
"$(INTDIR)\noblock.obj" \
101-
"$(INTDIR)\path.obj" \
102110
"$(INTDIR)\dllist.obj" \
103111
"$(INTDIR)\md5.obj" \
104112
"$(INTDIR)\ip.obj" \
@@ -121,15 +129,15 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
121129
LINK32=link.exe
122130
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib wsock32.lib $(SSL_LIBS) \
123131
/nologo /subsystem:windows /dll $(LOPT) /incremental:no\
124-
/pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
125-
/implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib" /def:$(OUTFILENAME)dll.def
132+
/pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
133+
/implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib" /def:$(OUTFILENAME)dll.def
126134
LINK32_OBJS= \
127135
"$(INTDIR)\libpqdll.obj" \
128-
"$(OUTDIR)\$(OUTFILENAME).lib" \
136+
"$(OUTDIR)\$(OUTFILENAME).lib" \
129137
"$(OUTDIR)\libpq.res"
130138

131139

132-
"$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
140+
"$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
133141
$(LIB32) @<<
134142
$(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
135143
<<
@@ -138,7 +146,7 @@ LINK32_OBJS= \
138146
$(RSC) $(RSC_PROJ) libpq.rc
139147

140148

141-
"$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(OUTDIR)\libpqdll.obj" "$(INTDIR)\libpqdll.obj" "$(INTDIR)\libpq.res"
149+
"$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(OUTDIR)\libpqdll.obj" "$(INTDIR)\libpqdll.obj" "$(INTDIR)\libpq.res"
142150
$(LINK32) @<<
143151
$(LINK32_FLAGS) $(LINK32_OBJS)
144152
<<
@@ -148,6 +156,11 @@ LINK32_OBJS= \
148156
$(CPP_PROJ) ..\..\port\getaddrinfo.c
149157
<<
150158

159+
"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
160+
$(CPP) @<<
161+
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
162+
<<
163+
151164
"$(INTDIR)\thread.obj" : ..\..\port\thread.c
152165
$(CPP) @<<
153166
$(CPP_PROJ) ..\..\port\thread.c
@@ -168,11 +181,6 @@ LINK32_OBJS= \
168181
$(CPP_PROJ) ..\..\port\noblock.c
169182
<<
170183

171-
"$(INTDIR)\path.obj" : ..\..\port\path.c
172-
$(CPP) @<<
173-
$(CPP_PROJ) ..\..\port\path.c
174-
<<
175-
176184
"$(INTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c
177185
$(CPP) @<<
178186
$(CPP_PROJ) ..\..\backend\lib\dllist.c

0 commit comments

Comments
 (0)