X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/76d3a838799e8abde2e7ac41fc59ef8785c29a6f..976374cdc06f5adb4217cb816f9bfe928d0809e6:/Recipe diff --git a/Recipe b/Recipe index 407b229b..457e7b66 100644 --- a/Recipe +++ b/Recipe @@ -21,6 +21,7 @@ !makefile ac unix/Makefile.in !makefile mpw mac/Makefile.mpw !makefile osx macosx/Makefile +!makefile devcppproj windows/DEVCPP # Source directories. !srcdir charset/ !srcdir windows/ @@ -35,24 +36,24 @@ # # Extra options you can set: # -# - 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 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 @@ -120,27 +127,23 @@ version.obj: *.c *.h *.rc !specialobj vc version !begin cygwin version.o: FORCE -FORCE: $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c !end !specialobj cygwin version !begin borland version.obj: FORCE -FORCE: bcc32 $(VER) $(CFLAGS) /c ..\version.c !end !specialobj borland version !begin lcc version.obj: FORCE -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) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \ else \ @@ -149,6 +152,30 @@ FORCE: !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 Makfile. +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 install: @@ -206,7 +233,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 ssharcf + + sshaes sshsh256 sshsh512 sshbn wildcard pinger ssharcf WINSSH = SSH winnoise winpgntc UXSSH = SSH uxnoise uxagentc MACSSH = SSH macnoise @@ -242,14 +269,14 @@ BE_NONE = be_none nocproxy # 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 +putty : [G] GUITERM NONSSH WINSSH BE_ALL WINMISC putty.res LIBS +puttytel : [G] GUITERM NONSSH BE_NOSSH WINMISC puttytel.res LIBS 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 wildcard WINMISC - + pscp.res LIBS + + psftp.res LIBS pageant : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234 + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc