X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Recipe;h=ce9d052b26f4e9a058a11f00e1df349e64f1b7e4;hb=b75856edfa23176be5cf9d9672cebb3ec060173b;hp=8f1ae44704aceb47d486f74b439b0715a889b0bb;hpb=a29dea954c1fe7420b27779e5a9d44ed07bf7a91;p=PuTTY.git

diff --git a/Recipe b/Recipe
index 8f1ae447..ce9d052b 100644
--- a/Recipe
+++ b/Recipe
@@ -32,9 +32,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.
@@ -115,25 +112,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
 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 +139,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
@@ -193,8 +190,8 @@ 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 gtkwin gtkdlg gtkcols gtkpanel gtkcfg uxcfg uxucs uxprint
+         + xkeysym timing
 
 # Non-SSH back ends (putty, puttytel, plink).
 NONSSH   = telnet raw rlogin ldisc pinger
@@ -256,9 +253,9 @@ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
 
 pterm    : [X] UXTERM 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] UXTERM 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] UXTERM 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
@@ -273,10 +270,10 @@ psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP 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