Fixed the printing and charset combo boxes in Unix PuTTY. (The

[u/mdw/putty] / Recipe

diff --git a/Recipe b/Recipe
index 2ec14c7..71eeb15 100644 (file)
--- 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.
 #
@@ -90,7 +95,10 @@
 
 # GUI front end and terminal emulator (putty, puttytel).
 GUITERM  = window windlg winctrls terminal sizetip wcwidth unicode ldiscucs
-         + logging printing winutils
+         + logging printing winutils dialog config wincfg tree234
+
+# Config box on Unix.
+UXCFG    = config uxcfg dialog gtkdlg gtkcols gtkpanel
 
 # Non-SSH back ends (putty, puttytel, plink).
 NONSSH   = telnet raw rlogin ldisc
@@ -101,6 +109,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,10 +117,14 @@ 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
-UXMISC   = misc version uxstore settings tree234 uxnet proxy cmdline
+         + windefs winmisc
+UXMISC   = misc version uxstore settings tree234 uxsel uxnet proxy cmdline
+         + uxmisc
+MACMISC  = misc version macstore settings tree234 macnet mtcpnet otnet proxy
+         + macmisc macabout
 
 # Character set library, for use in pterm.
-CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc
+CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
 
 # Standard libraries, and the same with WinSocks 1 and 2.
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
@@ -122,7 +135,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
@@ -132,18 +145,28 @@ 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
 
 pageant  : [G] pageant sshrsa sshpubk sshdes sshbn sshmd5 version tree234
-         + misc sshaes sshsha pageantc sshdss sshsh512 winutils
-         + pageant.res LIBS
+         + misc sshaes sshsha pageantc sshdss sshsh512 winutils winmisc
+         + sshrand noise winstore pageant.res LIBS
 
 puttygen : [G] puttygen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
-         + sshrand noise sshsha winstore misc winctrls sshrsa sshdss
-         + sshpubk sshaes sshsh512 import winutils puttygen.res LIBS
+         + 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 be_none uxstore signal CHARSET
-
-plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC
-
-PuTTY    : [M] terminal wcwidth tree234 misc ldisc ldiscucs
-         + logging settings be_none mac macdlg macstore macterm macucs
-         + mac_res.rsrc testback
+         + 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
+
+plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC signal ux_x11
+
+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
+PuTTYtel : [M] terminal wcwidth ldiscucs logging be_nossh mac macdlg macevlog
+         + macterm macucs mac_res.rsrc testback NONSSH MACMISC CHARSET
+         + stricmp vsnprint dialog config macctrls
+PuTTYgen : [M] macpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
+         + sshrand macnoise sshsha macstore misc sshrsa sshdss macmisc sshpubk
+         + sshaes sshsh512 import macpgen.rsrc macpgkey macabout