X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0f0a25075f6e788462506686cf538bc13a5beedb..224f397a29e27bc74af85762428fd0c38da4aa5e:/Recipe

diff --git a/Recipe b/Recipe
index 255c4cb1..64b1cb95 100644
--- a/Recipe
+++ b/Recipe
@@ -35,17 +35,14 @@
 #
 #  - COMPAT=/DNO_SECURITY
 #      Disables Pageant's use of <aclapi.h>, which is not available
-#      with some development environments. This means that Pageant
+#      with some development environments (such as older versions of
+#      the Cygwin/mingw GNU toolchain). This means that Pageant
 #      won't care about the local user ID of processes accessing it; a
 #      version of Pageant built with this option will therefore refuse
 #      to run under NT-series OSes on security grounds (although it
 #      will run fine on Win95-series OSes where there is no access
 #      control anyway).
 #
-#      Note that this definition is always enabled in the Cygwin
-#      build, since at the time of writing this <aclapi.h> is known
-#      not to be available in Cygwin.
-#
 #  - COMPAT=/DNO_MULTIMON
 #      Disables PuTTY's use of <multimon.h>, which is not available
 #      with some development environments. This means that PuTTY's
@@ -127,23 +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
-pscp     : [C] scp console WINSSH be_none SFTP wildcard WINMISC scp.res LIBS1
-psftp    : [C] psftp console WINSSH be_none SFTP WINMISC scp.res LIBS1
+         + plink.res LIBS
+pscp     : [C] scp winsftp console WINSSH be_none SFTP wildcard WINMISC
+         + 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
@@ -162,6 +158,9 @@ puttytel : [X] UXTERM uxmisc misc ldisc settings pty uxsel be_nossh uxstore
 
 plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC signal ux_x11
 
+pscp     : [U] scp uxsftp uxcons UXSSH be_none SFTP wildcard UXMISC
+psftp    : [U] psftp uxsftp uxcons UXSSH be_none SFTP UXMISC
+
 PuTTY    : [M] terminal wcwidth ldiscucs logging be_all mac macdlg macevlog
          + macterm macucs mac_res.rsrc testback NONSSH MACSSH MACMISC CHARSET
          + stricmp vsnprint dialog config macctrls