Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit886d7de

Browse files
committed
Fix win32.mak to support MULTIBYTE build --- it was pulling in several
backend files that it shouldn't anymore, causing compile failures.Per report from Darko Prenosil.
1 parentfd61fbe commit886d7de

File tree

1 file changed

+34
-20
lines changed

1 file changed

+34
-20
lines changed

‎src/interfaces/libpq/win32.mak‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,49 @@
44
# and a Win32 dynamic library (non-debug) libpq.dll with import library libpqdll.lib
55

66

7+
!MESSAGE Building the Win32 static library...
8+
!MESSAGE
9+
!IF "$(CFG)" == ""
10+
CFG=Release
11+
!MESSAGE No configuration specified. Defaulting to Release.
12+
!MESSAGE
13+
!ELSE
14+
!MESSAGE Configuration "$(CFG)"
15+
!MESSAGE
16+
!ENDIF
17+
18+
!IF "$(CFG)" != "Release" && "$(CFG)" != "MultibyteRelease"
19+
!MESSAGE Invalid configuration "$(CFG)" specified.
20+
!MESSAGE You can specify a configuration when running NMAKE
21+
!MESSAGEbydefiningthemacroCFGonthecommandline.Forexample:
22+
!MESSAGE
23+
!MESSAGE NMAKE /f win32.mak CFG=[Release | MultibyteRelease ]
24+
!MESSAGE
25+
!MESSAGEPossiblechoicesforconfigurationare:
26+
!MESSAGE
27+
!MESSAGE "Release" (Win32 Release DLL)
28+
!MESSAGE "MultibyteRelease" (Win32 Release DLL with Multibyte support)
29+
!MESSAGE
30+
!ERROR An invalid configuration was specified.
31+
!ENDIF
32+
33+
734
!IF "$(OS)" == "Windows_NT"
835
NULL=
936
!ELSE
1037
NULL=nul
1138
!ENDIF
1239

40+
!IF "$(CFG)" == "MultibyteRelease"
41+
MULTIBYTE=1
42+
!ENDIF
43+
1344
CPP=cl.exe
1445
RSC=rc.exe
1546

1647
OUTDIR=.\Release
1748
INTDIR=.\Release
49+
1850
# Begin Custom Macros
1951
OutDir=.\Release
2052
# End Custom Macros
@@ -39,16 +71,13 @@ CLEAN :
3971
-@erase"$(OUTDIR)\libpqdll.exp"
4072
-@erase"$(OUTDIR)\libpqdll.lib"
4173
!IFDEF MULTIBYTE
42-
-@erase "$(INTDIR)\common.obj"
4374
-@erase "$(INTDIR)\wchar.obj"
44-
-@erase "$(INTDIR)\conv.obj"
45-
-@erase "$(INTDIR)\big5.obj"
4675
!ENDIF
4776

4877
"$(OUTDIR)" :
4978
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
5079

51-
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
80+
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "FRONTEND" /D "NDEBUG" /D\
5281
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
5382
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
5483

@@ -75,7 +104,7 @@ LIB32_OBJS= \
75104
"$(INTDIR)\pqexpbuffer.obj"
76105

77106
!IFDEF MULTIBYTE
78-
LIB32_OBJS =$(LIB32_OBJS) "$(INTDIR)\common.obj" "$(INTDIR)\wchar.obj" "$(INTDIR)\conv.obj" "$(INTDIR)\big5.obj"
107+
LIB32_OBJS =$(LIB32_OBJS) "$(INTDIR)\wchar.obj"
79108
!ENDIF
80109

81110
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
@@ -114,25 +143,10 @@ LINK32_OBJS= \
114143

115144

116145
!IFDEF MULTIBYTE
117-
"$(INTDIR)\common.obj" : ..\..\backend\utils\mb\common.c
118-
$(CPP) @<<
119-
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\common.c
120-
<<
121-
122146
"$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
123147
$(CPP) @<<
124148
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
125149
<<
126-
127-
"$(INTDIR)\conv.obj" : ..\..\backend\utils\mb\conv.c
128-
$(CPP) @<<
129-
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\conv.c
130-
<<
131-
132-
"$(INTDIR)\big5.obj" : ..\..\backend\utils\mb\big5.c
133-
$(CPP) @<<
134-
$(CPP_PROJ) /I "." ..\..\backend\utils\mb\big5.c
135-
<<
136150
!ENDIF
137151

138152

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp