X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5d762aa45d43bcb6d26c6272917525a50c85745b..47a6b94c2389f0e2a4f42706818a12369746b713:/Recipe

diff --git a/Recipe b/Recipe
index 475a80d9..0b57a544 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
@@ -97,8 +94,9 @@
 GUITERM  = window windlg winctrls terminal sizetip wcwidth unicode ldiscucs
          + logging printing winutils dialog config wincfg tree234
 
-# Config box on Unix.
-UXCFG    = config uxcfg dialog gtkdlg gtkcols gtkpanel
+# Same thing on Unix.
+UXTERM   = pterm config uxcfg dialog gtkdlg gtkcols gtkpanel tree234
+         + terminal wcwidth uxucs ldiscucs logging uxprint xkeysym
 
 # Non-SSH back ends (putty, puttytel, plink).
 NONSSH   = telnet raw rlogin ldisc
@@ -117,53 +115,56 @@ SFTP     = sftp int64 logging
 # Miscellaneous objects appearing in all the network utilities (not
 # Pageant or PuTTYgen).
 WINMISC  = misc version winstore settings tree234 winnet proxy cmdline
-         + windefs winmisc
+         + windefs winmisc pproxy
 UXMISC   = misc version uxstore settings tree234 uxsel uxnet proxy cmdline
-         + uxmisc
+         + uxmisc uxproxy
 MACMISC  = misc version macstore settings tree234 macnet mtcpnet otnet proxy
-         + macmisc macabout
+         + macmisc macabout pproxy
 
 # 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
-         + sshrand noise winstore pageant.res LIBS
+         + pageant.res LIBS
 
 puttygen : [G] puttygen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand noise sshsha winstore misc winctrls sshrsa sshdss winmisc
          + sshpubk sshaes sshsh512 import winutils puttygen.res tree234 LIBS
 
-pterm    : [X] pterm terminal wcwidth uxucs uxmisc tree234 misc ldisc ldiscucs
-         + logging uxprint settings pty uxsel be_none uxstore signal CHARSET
-	 + cmdline ptermm UXCFG version
-putty    : [X] pterm terminal wcwidth uxucs uxmisc tree234 misc ldisc ldiscucs
-         + logging uxprint settings pty uxsel be_all uxstore signal CHARSET
-	 + uxputty NONSSH UXSSH UXMISC logging ux_x11 UXCFG
-puttytel : [X] pterm terminal wcwidth uxucs uxmisc tree234 misc ldisc ldiscucs
-         + logging uxprint settings pty uxsel be_nossh uxstore signal CHARSET
-	 + uxputty NONSSH UXMISC logging UXCFG
+pterm    : [X] UXTERM uxmisc misc ldisc settings pty uxsel be_none uxstore
+         + signal CHARSET cmdline ptermm version
+putty    : [X] UXTERM uxmisc misc ldisc settings pty uxsel be_all uxstore
+         + signal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11
+puttytel : [X] UXTERM uxmisc misc ldisc settings pty uxsel be_nossh uxstore
+         + signal CHARSET uxputty NONSSH UXMISC
 
 plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC signal ux_x11
 
+puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
+         + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc
+         + sshpubk sshaes sshsh512 import puttygen.res tree234 uxgen
+
+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