X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e693a2d9c8385b9177a24e28ab63701973975919..7090f35ef6488cfff4cd9eced456378c4ca8e09d:/Recipe diff --git a/Recipe b/Recipe index 8f1ae447..a82a969c 100644 --- a/Recipe +++ b/Recipe @@ -18,12 +18,16 @@ !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. @@ -32,9 +36,6 @@ # # Extra options you can set: # -# - FWHACK=/DFWHACK -# Enables a hack that tunnels through some firewall proxies. -# # - VER=/DSNAPSHOT=1999-01-25 # Generates executables whose About box report them as being a # development snapshot. @@ -43,16 +44,16 @@ # 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 includes its own WinSock # header file, so that it won't try to include . # -# - COMPAT=/DWINSOCK_TWO +# - COMPAT=/DWINSOCK_TWO (Windows only) # Causes the PuTTY utilities to include instead of # , except Plink which _needs_ WinSock 2 so it already # does this. # -# - COMPAT=/DNO_SECURITY +# - COMPAT=/DNO_SECURITY (Windows only) # Disables Pageant's use of , which is not available # with some development environments (such as older versions of # the Cygwin/mingw GNU toolchain). This means that Pageant @@ -62,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 , which is not available # with some development environments. This means that PuTTY's # full-screen mode (configurable to work on Alt-Enter) will @@ -72,17 +73,23 @@ # build, since at the time of writing this is # known not to be available in Cygwin. # +# - 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 +# - 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 @@ -100,7 +107,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 @@ -115,25 +122,25 @@ # 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 + $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c !end !specialobj cygwin version !begin borland version.obj: FORCE FORCE: - bcc32 $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c + bcc32 $(VER) $(CFLAGS) /c ..\version.c !end !specialobj borland version !begin lcc -version.o: FORCE +version.obj: FORCE FORCE: - lcc $(FWHACK) $(VER) $(CFLAGS) /c ..\version.c + lcc $(VER) $(CFLAGS) /c ..\version.c !end !specialobj lcc version # For Unix, we also need the gross MD5 hack that causes automatic @@ -142,9 +149,9 @@ FORCE: version.o: FORCE; 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 @@ -177,6 +184,9 @@ install: install-strip: $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" !end +!begin osx vars +CFLAGS += -DMACOSX +!end # ------------------------------------------------------------ # Definitions of object groups. A group name, followed by an =, @@ -193,8 +203,9 @@ GUITERM = TERMINAL window windlg winctrls sizetip winucs winprint + winutils wincfg # Same thing on Unix. -UXTERM = TERMINAL gtkwin gtkdlg gtkcols gtkpanel uxcfg uxucs uxprint xkeysym - + timing +UXTERM = TERMINAL uxcfg uxucs uxprint timing +GTKTERM = UXTERM gtkwin gtkcfg gtkdlg gtkcols gtkpanel xkeysym +OSXTERM = UXTERM osxwin osxdlg osxctrls # Non-SSH back ends (putty, puttytel, plink). NONSSH = telnet raw rlogin ldisc pinger @@ -202,7 +213,7 @@ 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 pinger + + sshaes sshsh512 sshbn wildcard pinger ssharcf WINSSH = SSH winnoise winpgntc UXSSH = SSH uxnoise uxagentc MACSSH = SSH macnoise @@ -215,6 +226,7 @@ SFTP = sftp int64 logging MISC = timing misc version settings tree234 proxy WINMISC = MISC winstore winnet cmdline windefs winmisc pproxy 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. @@ -243,7 +255,8 @@ plink : [C] winplink wincons NONSSH WINSSH BE_ALL logging WINMISC + plink.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 WINMISC pscp.res LIBS +psftp : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC + + pscp.res LIBS pageant : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234 + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc @@ -254,11 +267,11 @@ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version + sshpubk sshaes sshsh512 import winutils puttygen.res tree234 + notiming LIBS wintime -pterm : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore +pterm : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore + uxsignal CHARSET cmdline uxpterm version time -putty : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_ALL uxstore +putty : [X] GTKTERM uxmisc misc ldisc settings uxsel BE_ALL uxstore + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 -puttytel : [X] UXTERM uxmisc misc ldisc settings uxpty uxsel BE_NOSSH +puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel BE_NOSSH + uxstore uxsignal CHARSET uxputty NONSSH UXMISC plink : [U] uxplink uxcons NONSSH UXSSH BE_ALL logging UXMISC uxsignal ux_x11 @@ -269,14 +282,17 @@ puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version + notiming pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC -psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP UXMISC +psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard 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 + + 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 + + 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 BE_ALL NONSSH UXSSH + + ux_x11 uxpty uxsignal testback putty.icns info.plist