1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 19:42:48 -05:00

The WinSock library is now loaded at run-time, which means we can

attempt to load WS2 and then fall back to WS1 if that fails. This
should allow us to use WS2-specific functionality to find out the
local system's list of IP addresses, thus fixing winnet-if2lo, while
degrading gracefully back to the previous behaviour if that
functionality is unavailable. (I haven't yet actually done this; I've
just laid the groundwork.)
This checkin _may_ cause instability; it seemed fine to me on
initial testing, but it's a bit of an upheaval and I wouldn't like
to make bets on it just yet.

[originally from svn r3502]
This commit is contained in:
Simon Tatham
2003-10-12 13:46:12 +00:00
parent 8e2fd15bd5
commit e30aed9a6f
21 changed files with 230 additions and 230 deletions

14
Recipe
View File

@ -124,24 +124,22 @@ MACMISC = misc version macstore settings tree234 macnet mtcpnet otnet proxy
# Character set library, for use in pterm.
CHARSET = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
# Standard libraries, and the same with WinSocks 1 and 2.
# Standard libraries.
LIBS = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
+ shell32.lib winmm.lib imm32.lib winspool.lib
LIBS1 = LIBS wsock32.lib
LIBS2 = LIBS ws2_32.lib
# Definitions of actual programs. The program name, followed by a
# colon, followed by a list of objects. Also in the list may be the
# keywords [G] for Windows GUI app, [C] for Console app, [X] for
# X/GTK Unix app, [U] for command-line Unix app, [M] for Macintosh app.
putty : [G] GUITERM NONSSH WINSSH be_all WINMISC win_res.res LIBS1
puttytel : [G] GUITERM NONSSH be_nossh WINMISC win_res.res LIBS1
putty : [G] GUITERM NONSSH WINSSH be_all WINMISC win_res.res LIBS
puttytel : [G] GUITERM NONSSH be_nossh WINMISC win_res.res LIBS
plink : [C] plink console NONSSH WINSSH be_all logging WINMISC
+ plink.res LIBS2
+ plink.res LIBS
pscp : [C] scp winsftp console WINSSH be_none SFTP wildcard WINMISC
+ scp.res LIBS1
psftp : [C] psftp winsftp console WINSSH be_none SFTP WINMISC scp.res LIBS1
+ scp.res LIBS
psftp : [C] psftp winsftp console WINSSH be_none SFTP WINMISC scp.res LIBS
pageant : [G] pageant sshrsa sshpubk sshdes sshbn sshmd5 version tree234
+ misc sshaes sshsha pageantc sshdss sshsh512 winutils winmisc