X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cdd310bb1a216ee7713926b6cd813016fe5343ee..85aa0836a099c76f5398fa8d3f0128c28d083a80:/Recipe

diff --git a/Recipe b/Recipe
index 8cbc841e..79ea3b0b 100644
--- a/Recipe
+++ b/Recipe
@@ -12,17 +12,22 @@
 # Overall project name.
 !name putty
 # Locations and types of output Makefiles.
-!makefile vc Makefile.vc
-!makefile vcproj MSVC
-!makefile cygwin Makefile.cyg
-!makefile borland Makefile.bor
-!makefile lcc Makefile.lcc
+!makefile vc windows/Makefile.vc
+!makefile vcproj windows/MSVC
+!makefile cygwin windows/Makefile.cyg
+!makefile borland windows/Makefile.bor
+!makefile lcc windows/Makefile.lcc
 !makefile gtk unix/Makefile.gtk
+!makefile ac unix/Makefile.in
 !makefile mpw mac/Makefile.mpw
+!makefile osx macosx/Makefile
+!makefile devcppproj windows/DEVCPP
 # Source directories.
 !srcdir charset/
+!srcdir windows/
 !srcdir unix/
 !srcdir mac/
+!srcdir macosx/
 
 # Help text added to the top of each Makefile, with /D converted
 # into -D as appropriate for the particular Makefile.
@@ -31,27 +36,24 @@
 #
 # Extra options you can set:
 #
-#  - FWHACK=/DFWHACK
-#      Enables a hack that tunnels through some firewall proxies.
-#
-#  - VER=/DSNAPSHOT=1999-01-25
+#  - VER="/DSNAPSHOT=1999-01-25 /DSVN_REV=1234"
 #      Generates executables whose About box report them as being a
-#      development snapshot.
+#      development snapshot. SVN_REV is a Subversion revision number.
 #
 #  - VER=/DRELEASE=0.43
 #      Generates executables whose About box report them as being a
 #      release version.
 #
-#  - COMPAT=/DAUTO_WINSOCK
+#  - COMPAT=/DAUTO_WINSOCK (Windows only)
 #      Causes PuTTY to assume that <windows.h> includes its own WinSock
 #      header file, so that it won't try to include <winsock.h>.
 #
-#  - COMPAT=/DWINSOCK_TWO
+#  - COMPAT=/DWINSOCK_TWO (Windows only)
 #      Causes the PuTTY utilities to include <winsock2.h> instead of
 #      <winsock.h>, except Plink which _needs_ WinSock 2 so it already
 #      does this.
 #
-#  - COMPAT=/DNO_SECURITY
+#  - COMPAT=/DNO_SECURITY (Windows only)
 #      Disables Pageant's use of <aclapi.h>, which is not available
 #      with some development environments (such as older versions of
 #      the Cygwin/mingw GNU toolchain). This means that Pageant
@@ -61,7 +63,7 @@
 #      will run fine on Win95-series OSes where there is no access
 #      control anyway).
 #
-#  - COMPAT=/DNO_MULTIMON
+#  - COMPAT=/DNO_MULTIMON (Windows only)
 #      Disables PuTTY's use of <multimon.h>, which is not available
 #      with some development environments. This means that PuTTY's
 #      full-screen mode (configurable to work on Alt-Enter) will
@@ -71,12 +73,34 @@
 #      build, since at the time of writing this <multimon.h> is
 #      known not to be available in Cygwin.
 #
-#  - COMPAT=/DMSVC4
+#  - COMPAT=/DNO_HTMLHELP (Windows only)
+#      Disables PuTTY's use of <htmlhelp.h>, which is not available
+#      with some development environments. The resulting binary
+#      will only look for an old-style WinHelp file (.HLP/.CNT), and
+#      will ignore any .CHM file.
+#
+#      Note that this definition is always enabled in the Cygwin
+#      build, since at the time of writing this <htmlhelp.h> is
+#      known not to be available in Cygwin (although you can use
+#      the htmlhelp.h supplied with HTML Help Workshop).
+#
+#  - RCFL=/DNO_MANIFESTS (Windows only)
+#      Disables inclusion of XML application manifests in the PuTTY
+#      binaries. This may be necessary to build for 64-bit Windows;
+#      the manifests are only included to use the XP GUI style on
+#      Windows XP, and the architecture tags are a lie on 64-bit.
+#
+#  - COMPAT=/DNO_IPV6
+#      Disables PuTTY's ability to make IPv6 connections, enabling
+#      it to compile under development environments which do not
+#      support IPv6 in their header files.
+#
+#  - COMPAT=/DMSVC4 (Windows only)
 #  - RCFL=/DMSVC4
 #      Makes a couple of minor changes so that PuTTY compiles using
 #      MSVC 4. You will also need /DNO_SECURITY and /DNO_MULTIMON.
 #
-#  - RCFL=/DASCIICTLS
+#  - RCFL=/DASCIICTLS (Windows only)
 #      Uses ASCII rather than Unicode to specify the tab control in
 #      the resource file. Probably most useful when compiling with
 #      Cygnus/mingw32, whose resource compiler may have less of a
@@ -94,7 +118,7 @@
 #      Causes PuTTY to emit a file called putty_mem.log, logging every
 #      memory allocation and free, so you can track memory leaks.
 #
-#  - XFLAGS=/DMINEFIELD
+#  - XFLAGS=/DMINEFIELD (Windows only)
 #      Causes PuTTY to use a custom memory allocator, similar in
 #      concept to Electric Fence, in place of regular malloc(). Wastes
 #      huge amounts of RAM, but should cause heap-corruption bugs to
@@ -109,34 +133,59 @@
 # Hack to force version.o to be rebuilt always.
 !begin vc
 version.obj: *.c *.h *.rc
-	cl $(FWHACK) $(VER) $(CFLAGS) /c version.c
+	cl $(VER) $(CFLAGS) /c ..\version.c
 !end
+!specialobj vc version
 !begin cygwin
-version.o: FORCE;
-FORCE:
-	$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c version.c
+version.o: FORCE
+	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c
 !end
+!specialobj cygwin version
 !begin borland
 version.obj: FORCE
-FORCE:
-	bcc32 $(FWHACK) $(VER) $(CFLAGS) /c version.obj
+	bcc32 $(VER) $(CFLAGS) /c ..\version.c
 !end
+!specialobj borland version
 !begin lcc
-version.o: FORCE
-FORCE:
-	lcc $(FWHACK) $(VER) $(CFLAGS) /c version.c
+version.obj: FORCE
+	lcc $(VER) $(CFLAGS) /c ..\version.c
 !end
+!specialobj lcc version
 # For Unix, we also need the gross MD5 hack that causes automatic
 # version number selection in release source archives.
 !begin gtk
-version.o: FORCE;
-FORCE:
+version.o: FORCE
 	if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
-		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
 	else \
-		$(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
+		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
 	fi
 !end
+!specialobj gtk version
+
+# Add VER to Windows resource targets, and force them to be rebuilt every
+# time, on the assumption that they will contain version information.
+!begin vc vars
+RCFLAGS = $(RCFLAGS) $(VER)
+!end
+!begin cygwin vars
+# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile.
+RCFLAGS += $(patsubst -D%,--define %,$(VER))
+!end
+!begin borland vars
+# Borland doesn't support +=. This probably shouldn't work, but seems to.
+RCFLAGS = $(RCFLAGS) $(VER)
+!end
+!begin lcc vars
+RCFLAGS += $(VER)
+!end
+!forceobj putty.res
+!forceobj puttytel.res
+!forceobj plink.res
+!forceobj pscp.res
+!forceobj psftp.res
+!forceobj pageant.res
+!forceobj puttygen.res
 
 # `make install' target for Unix.
 !begin gtk
@@ -145,6 +194,13 @@ install:
 	$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
 	$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
 	$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
+	if test -n "$(UTMP_GROUP)"; then \
+	  chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
+	    chmod 2755 $(DESTDIR)$(bindir)/pterm; \
+	elif test -n "$(UTMP_USER)"; then \
+	  chown $(UTMP_USER) $(DESTDIR)$(bindir)/pterm && \
+	    chmod 4755 $(DESTDIR)$(bindir)/pterm; \
+	fi
 	$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
 	$(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
 	$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
@@ -159,6 +215,18 @@ install:
 install-strip:
 	$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s"
 !end
+!begin osx vars
+CFLAGS += -DMACOSX
+!end
+
+# Random symbols.
+!begin cygwin vars
+# _WIN32_IE is required to expose identifiers that only make sense on
+# systems with IE5+ installed, such as some arguments to SHGetFolderPath().
+# WINVER etc perform a similar function for FlashWindowEx().
+CFLAGS += -D_WIN32_IE=0x0500
+CFLAGS += -DWINVER=0x0500 -D_WIN32_WINDOWS=0x0410 -D_WIN32_WINNT=0x0500
+!end
 
 # ------------------------------------------------------------
 # Definitions of object groups. A group name, followed by an =,
@@ -166,22 +234,27 @@ install-strip:
 # names. A line beginning `+' is assumed to continue the previous
 # line.
 
+# Terminal emulator and its (platform-independent) dependencies.
+TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi
+         + config dialog
+
 # GUI front end and terminal emulator (putty, puttytel).
-GUITERM  = window windlg winctrls terminal sizetip wcwidth unicode ldiscucs
-         + logging printing winutils dialog config wincfg tree234
+GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
+         + winutils wincfg sercfg winhelp
 
 # Same thing on Unix.
-UXTERM   = pterm config uxcfg dialog gtkdlg gtkcols gtkpanel tree234
-         + terminal wcwidth uxucs ldiscucs logging uxprint xkeysym
+UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing
+GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkcols xkeysym
+OSXTERM  = UXTERM osxwin osxdlg osxctrls
 
 # Non-SSH back ends (putty, puttytel, plink).
-NONSSH   = telnet raw rlogin ldisc
+NONSSH   = telnet raw rlogin ldisc pinger
 
 # SSH back end (putty, plink, pscp, psftp).
 SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
-         + sshaes sshsh512 sshbn wildcard
-WINSSH   = SSH noise pageantc
+         + sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf
+WINSSH   = SSH winnoise winpgntc
 UXSSH    = SSH uxnoise uxagentc
 MACSSH   = SSH macnoise
 
@@ -190,12 +263,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 pproxy
-UXMISC   = misc version uxstore settings tree234 uxsel uxnet proxy cmdline
-         + uxmisc uxproxy
-MACMISC  = misc version macstore settings tree234 macnet mtcpnet otnet proxy
-         + macmisc macabout pproxy
+MISC     = timing misc version settings tree234 proxy
+WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
+         + wintime
+UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time
+OSXMISC  = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time
+MACMISC  = MISC macstore macnet mtcpnet otnet macmisc macabout pproxy
 
 # Character set library, for use in pterm.
 CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
@@ -204,50 +277,71 @@ CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
          + shell32.lib winmm.lib imm32.lib winspool.lib
 
+# Network backend sets. This also brings in the relevant attachment
+# to proxy.c depending on whether we're crypto-avoidant or not.
+BE_ALL   = be_all cproxy
+BE_NOSSH = be_nossh nocproxy
+BE_SSH   = be_none cproxy
+BE_NONE  = be_none nocproxy
+# More backend sets, with the additional Windows serial-port module.
+W_BE_ALL = be_all_s winser cproxy
+W_BE_NOSSH = be_nos_s winser nocproxy
+# And with the Unix serial-port module.
+U_BE_ALL = be_all_s uxser cproxy
+U_BE_NOSSH = be_nos_s uxser nocproxy
+
 # ------------------------------------------------------------
 # 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 LIBS
-puttytel : [G] GUITERM NONSSH be_nossh WINMISC win_res.res LIBS
-plink    : [C] plink console NONSSH WINSSH be_all logging WINMISC
+putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC putty.res LIBS
+puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res LIBS
+plink    : [C] winplink wincons NONSSH WINSSH W_BE_ALL logging WINMISC
          + 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
+pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
+         + pscp.res LIBS
+psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
+         + psftp.res LIBS
 
-pageant  : [G] pageant sshrsa sshpubk sshdes sshbn sshmd5 version tree234
-         + misc sshaes sshsha pageantc sshdss sshsh512 winutils winmisc
-         + pageant.res LIBS
+pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
+         + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc
+         + winhelp 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
+puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
+         + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc
+         + sshpubk sshaes sshsh512 import winutils puttygen.res tree234
+	 + notiming winhelp LIBS wintime
 
-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
+pterm    : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
+         + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg
+putty    : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore
+         + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty
+         + xpmpucfg
+puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH
+	 + uxstore uxsignal CHARSET uxputty NONSSH UXMISC xpmputty xpmpucfg
 
-plink    : [U] uxplink uxcons NONSSH UXSSH be_all logging UXMISC signal ux_x11
+plink    : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal
+         + 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
+         + sshpubk sshaes sshsh512 import puttygen.res time tree234 uxgen
+         + notiming
 
-pscp     : [U] scp uxsftp uxcons UXSSH be_none SFTP wildcard UXMISC
-psftp    : [U] psftp uxsftp uxcons UXSSH be_none SFTP UXMISC
+pscp     : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
+psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 
-PuTTY    : [M] terminal wcwidth ldiscucs logging be_all mac macdlg macevlog
+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
+         + stricmp vsnprint dialog config macctrls minibidi
+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 minibidi
 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
+
+PuTTY    : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH
+         + ux_x11 uxpty uxsignal testback putty.icns info.plist