X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/6cb61a05b6157236bbea7b351cfc741eb6853605..2c02ed028a9e4fadd23668e39dbf349e60cb7eff:/Recipe

diff --git a/Recipe b/Recipe
index aa3e0f91..7327c66b 100644
--- a/Recipe
+++ b/Recipe
@@ -67,6 +67,11 @@
 #      Cygnus/mingw32, whose resource compiler may have less of a
 #      problem with it.
 #
+#  - XFLAGS=/DTELNET_DEFAULT
+#      Causes PuTTY to default to the Telnet protocol (in the absence
+#      of Default Settings and so on to the contrary). Normally PuTTY
+#      will default to SSH.
+#
 #  - XFLAGS=/DDEBUG
 #      Causes PuTTY to enable internal debugging.
 #
@@ -101,6 +106,7 @@ SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshaes sshsh512 sshbn wildcard
 WINSSH   = SSH noise pageantc
 UXSSH    = SSH uxnoise uxagentc
+MACSSH   = SSH macnoise
 
 # SFTP implementation (pscp, psftp).
 SFTP     = sftp int64 logging
@@ -108,7 +114,12 @@ 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
 UXMISC   = misc version uxstore settings tree234 uxnet proxy cmdline
+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
 
 # Standard libraries, and the same with WinSocks 1 and 2.
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
@@ -119,7 +130,7 @@ 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.
+# 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
@@ -137,10 +148,13 @@ puttygen : [G] puttygen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshpubk sshaes sshsh512 import winutils puttygen.res LIBS
 
 pterm    : [X] pterm terminal wcwidth uxucs uxmisc tree234 misc ldisc ldiscucs
-         + logging uxprint settings pty be_none uxstore signal
+         + logging uxprint settings pty be_none uxstore signal CHARSET
 
-plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC
+plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC signal ux_x11
 
-PuTTY    : [M] terminal wcwidth tree234 misc ldisc ldiscucs
-         + logging settings be_none mac macdlg macstore macterm macucs
-         + mac_res.rsrc testback
+PuTTY    : [M] terminal wcwidth ldiscucs logging be_all mac macdlg
+         + macterm macucs mac_res.rsrc testback NONSSH MACSSH MACMISC CHARSET
+         + stricmp vsnprint
+PuTTYtel : [M] terminal wcwidth ldiscucs logging be_nossh mac macdlg
+         + macterm macucs mac_res.rsrc testback NONSSH MACMISC CHARSET
+         + stricmp vsnprint