X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/8fd3bdc4ee9fe7d3036a36b70affe273008024e2..11cd814b19dd4278d51ab15c14e81fb8ee96777c:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index d59854d0..f9c48c0a 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -9,13 +9,23 @@
 
 use FileHandle;
 
-open IN, "Recipe" or die "unable to open Recipe file\n";
+open IN, "Recipe" or do {
+    # We want to deal correctly with being run from one of the
+    # subdirs in the source tree. So if we can't find Recipe here,
+    # try one level up.
+    chdir "..";
+    open IN, "Recipe" or die "unable to open Recipe file\n";
+};
 
-@incdirs = ("", "unix/");
+# HACK: One of the source files in `charset' is auto-generated by
+# sbcsgen.pl. We need to generate that _now_, before attempting
+# dependency analysis.
+eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."';
+
+@incdirs = ("", "charset/", "unix/", "mac/");
 
 $help = ""; # list of newline-free lines of help text
-%programs = (); # maps program name to listref of objects/resources
-%types = (); # maps program name to "G" or "C"
+%programs = (); # maps prog name + type letter to listref of objects/resources
 %groups = (); # maps group name to listref of objects/resources
 
 while (<IN>) {
@@ -46,8 +56,7 @@ while (<IN>) {
     $prog = undef;
     shift @objs; # eat the group name
   } elsif ($_[1] eq ":") {
-    $programs{$_[0]} = [] if !defined $programs{$_[0]};
-    $listref = $programs{$_[0]};
+    $listref = [];
     $prog = $_[0];
     shift @objs; # eat the program name
   } else {
@@ -59,12 +68,18 @@ while (<IN>) {
     $i = shift @objs;
     if ($groups{$i}) {
       foreach $j (@{$groups{$i}}) { unshift @objs, $j; }
-    } elsif (($i eq "[G]" or $i eq "[C]" or $i eq "[X]") and defined $prog) {
-      $types{$prog} = substr($i,1,1);
+    } elsif (($i eq "[G]" or $i eq "[C]" or $i eq "[M]" or
+	      $i eq "[X]" or $i eq "[U]") and defined $prog) {
+      $type = substr($i,1,1);
     } else {
       push @$listref, $i;
     }
   }
+  if ($prog and $type) {
+    die "multiple program entries for $prog [$type]\n"
+	if defined $programs{$prog . "," . $type};
+    $programs{$prog . "," . $type} = $listref;
+  }
   $lastlistref = $listref;
 }
 
@@ -77,7 +92,7 @@ close IN;
 %depends = ();
 @scanlist = ();
 foreach $i (@prognames) {
-  if (!defined $types{$i}) { die "type not set for program $i\n"; }
+  ($prog, $type) = split ",", $i;
   # Strip duplicate object names.
   $prev = undef;
   @list = grep { $status = ($prev ne $_); $prev=$_; $status }
@@ -86,12 +101,17 @@ foreach $i (@prognames) {
   foreach $j (@list) {
     # Dependencies for "x" start with "x.c".
     # Dependencies for "x.res" start with "x.rc".
+    # Dependencies for "x.rsrc" start with "x.r".
     # Both types of file are pushed on the list of files to scan.
     # Libraries (.lib) don't have dependencies at all.
     if ($j =~ /^(.*)\.res$/) {
       $file = "$1.rc";
       $depends{$j} = [$file];
       push @scanlist, $file;
+    } elsif ($j =~ /^(.*)\.rsrc$/) {
+      $file = "$1.r";
+      $depends{$j} = [$file];
+      push @scanlist, $file;
     } elsif ($j =~ /\.lib$/) {
       # libraries don't have dependencies
     } else {
@@ -164,12 +184,15 @@ foreach $i (keys %depends) {
 sub findfile {
   my ($name) = @_;
   my $dir, $i, $outdir = "";
-  $i = 0;
-  foreach $dir (@incdirs) {
-    $outdir = $dir, $i++ if -f "$dir$name";
+  unless (defined $findfilecache{$name}) {
+    $i = 0;
+    foreach $dir (@incdirs) {
+      $outdir = $dir, $i++ if -f "$dir$name";
+    }
+    die "multiple instances of source file $name\n" if $i > 1;
+    $findfilecache{$name} = $outdir . $name;
   }
-  die "multiple instances of source file $name\n" if $i > 1;
-  return "$outdir$name";
+  return $findfilecache{$name};
 }
 
 sub objects {
@@ -179,7 +202,7 @@ sub objects {
   @ret = ();
   foreach $i (@{$programs{$prog}}) {
     $x = "";
-    if ($i =~ /^(.*)\.res/) {
+    if ($i =~ /^(.*)\.(res|rsrc)/) {
       $y = $1;
       ($x = $rtmpl) =~ s/X/$y/;
     } elsif ($i =~ /^(.*)\.lib/) {
@@ -194,12 +217,13 @@ sub objects {
 }
 
 sub splitline {
-  my ($line, $width) = @_;
+  my ($line, $width, $splitchar) = @_;
   my ($result, $len);
   $len = (defined $width ? $width : 76);
+  $splitchar = (defined $splitchar ? $splitchar : '\\');
   while (length $line > $len) {
     $line =~ /^(.{0,$len})\s(.*)$/ or $line =~ /^(.{$len,}?\s(.*)$/;
-    $result .= $1 . " \\\n\t\t";
+    $result .= $1 . " ${splitchar}\n\t\t";
     $line = $2;
     $len = 60;
   }
@@ -207,11 +231,13 @@ sub splitline {
 }
 
 sub deps {
-  my ($otmpl, $rtmpl, $prefix, $dirsep) = @_;
+  my ($otmpl, $rtmpl, $prefix, $dirsep, $depchar, $splitchar) = @_;
   my ($i, $x, $y);
-  my @deps;
+  my @deps, @ret;
+  @ret = ();
+  $depchar ||= ':';
   foreach $i (sort keys %depends) {
-    if ($i =~ /^(.*)\.res/) {
+    if ($i =~ /^(.*)\.(res|rsrc)/) {
       next if !defined $rtmpl;
       $y = $1;
       ($x = $rtmpl) =~ s/X/$y/;
@@ -224,21 +250,45 @@ sub deps {
       s/\//$dirsep/g;
       $_ = $prefix . $_;
     } @deps;
-    print &splitline(sprintf "%s: %s", $x, join " ", @deps), "\n";
+    push @ret, {obj => $x, deps => [@deps]};
   }
+  return @ret;
 }
 
 sub prognames {
   my ($types) = @_;
-  my ($n);
+  my ($n, $prog, $type);
+  my @ret;
+  @ret = ();
+  foreach $n (@prognames) {
+    ($prog, $type) = split ",", $n;
+    push @ret, $n if index($types, $type) >= 0;
+  }
+  return @ret;
+}
+
+sub progrealnames {
+  my ($types) = @_;
+  my ($n, $prog, $type);
   my @ret;
   @ret = ();
   foreach $n (@prognames) {
-    push @ret, $n if index($types, $types{$n}) >= 0;
+    ($prog, $type) = split ",", $n;
+    push @ret, $prog if index($types, $type) >= 0;
   }
   return @ret;
 }
 
+sub manpages {
+  my ($types,$suffix) = @_;
+
+  # assume that all UNIX programs have a man page
+  if($suffix eq "1" && $types =~ /X/) {
+    return map("$_.1", &progrealnames($types));
+  }
+  return ();
+}
+
 # Now we're ready to output the actual Makefiles.
 
 ##-- CygWin makefile
@@ -257,11 +307,14 @@ print
 "# TOOLPATH = /pkg/mingw32msvc/i386-mingw32msvc/bin/\n".
 "CC = \$(TOOLPATH)gcc\n".
 "RC = \$(TOOLPATH)windres\n".
+"# Uncomment the following two lines to compile under Winelib\n".
+"# CC = winegcc\n".
+"# RC = wrc\n".
 "# You may also need to tell windres where to find include files:\n".
 "# RCINC = --include-dir c:\\cygwin\\include\\\n".
 "\n".
 &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
-  " -DNO_SECURITY -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
+  " -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
 "LDFLAGS = -mno-cygwin -s\n".
 &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
   " --define WINVER=0x0400 --define MINGW32_FIX=1")."\n".
@@ -274,17 +327,21 @@ print
 "%.res.o: %.rc\n".
 "\t\$(RC) \$(FWHACK) \$(RCFL) \$(RCFLAGS) \$< \$\@\n".
 "\n";
-print &splitline("all:" . join "", map { " $_.exe" } &prognames("GC"));
+print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
 print "\n\n";
 foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.o", "X.res.o", undef);
-  print &splitline($p . ".exe: " . $objstr), "\n";
-  my $mw = $types{$p} eq "G" ? " -mwindows" : "";
+  print &splitline($prog . ".exe: " . $objstr), "\n";
+  my $mw = $type eq "G" ? " -mwindows" : "";
   $libstr = &objects($p, undef, undef, "-lX");
   print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
                    $objstr . " $libstr", 69), "\n\n";
 }
-&deps("X.o", "X.res.o", "", "/");
+foreach $d (&deps("X.o", "X.res.o", "", "/")) {
+  print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
+    "\n";
+}
 print
 "\n".
 "version.o: FORCE;\n".
@@ -324,7 +381,7 @@ print
 "MAKEFILE = Makefile.bor\n".
 "\n".
 "# C compilation flags\n".
-"CFLAGS = -DWINVER=0x0401\n".
+"CFLAGS = -D_WINDOWS -DWINVER=0x0401\n".
 "\n".
 "# Get include directory for resource compiler\n".
 "!if !\$d(BCB)\n".
@@ -338,16 +395,18 @@ print
 &splitline("\tbrcc32 \$(FWHACK) \$(RCFL) -i \$(BCB)\\include -r".
   " -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401 \$*.rc",69)."\n".
 "\n";
-print &splitline("all:" . join "", map { " $_.exe" } &prognames("GC"));
+print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
 print "\n\n";
 foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.obj", "X.res", undef);
-  print &splitline("$p.exe: " . $objstr . " $p.rsp"), "\n";
-  my $ap = ($types{$p} eq "G") ? "-aa" : "-ap";
-  print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$p.rsp\n\n";
+  print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n";
+  my $ap = ($type eq "G") ? "-aa" : "-ap";
+  print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$prog.rsp\n\n";
 }
 foreach $p (&prognames("GC")) {
-  print $p, ".rsp: \$(MAKEFILE)\n";
+  ($prog, $type) = split ",", $p;
+  print $prog, ".rsp: \$(MAKEFILE)\n";
   $objstr = &objects($p, "X.obj", undef, undef);
   @objlist = split " ", $objstr;
   @objlines = ("");
@@ -357,23 +416,26 @@ foreach $p (&prognames("GC")) {
     }
     $objlines[$#objlines] .= " $i";
   }
-  $c0w = ($types{$p} eq "G") ? "c0w32" : "c0x32";
-  print "\techo $c0w + > $p.rsp\n";
+  $c0w = ($type eq "G") ? "c0w32" : "c0x32";
+  print "\techo $c0w + > $prog.rsp\n";
   for ($i=0; $i<=$#objlines; $i++) {
     $plus = ($i < $#objlines ? " +" : "");
-    print "\techo$objlines[$i]$plus >> $p.rsp\n";
+    print "\techo$objlines[$i]$plus >> $prog.rsp\n";
   }
-  print "\techo $p.exe >> $p.rsp\n";
+  print "\techo $prog.exe >> $prog.rsp\n";
   $objstr = &objects($p, "X.obj", "X.res", undef);
   @libs = split " ", &objects($p, undef, undef, "X");
   @libs = grep { !$stdlibs{$_} } @libs;
   unshift @libs, "cw32", "import32";
   $libstr = join ' ', @libs;
-  print "\techo nul,$libstr, >> $p.rsp\n";
-  print "\techo " . &objects($p, undef, "X.res", undef) . " >> $p.rsp\n";
+  print "\techo nul,$libstr, >> $prog.rsp\n";
+  print "\techo " . &objects($p, undef, "X.res", undef) . " >> $prog.rsp\n";
   print "\n";
 }
-&deps("X.obj", "X.res", "", "\\");
+foreach $d (&deps("X.obj", "X.res", "", "\\")) {
+  print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
+    "\n";
+}
 print
 "\n".
 "version.o: FORCE\n".
@@ -415,15 +477,17 @@ print
 ".rc.res:\n".
 "\trc \$(FWHACK) \$(RCFL) -r -DWIN32 -D_WIN32 -DWINVER=0x0400 \$*.rc\n".
 "\n";
-print &splitline("all:" . join "", map { " $_.exe" } &prognames("GC"));
+print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("GC"));
 print "\n\n";
 foreach $p (&prognames("GC")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.obj", "X.res", undef);
-  print &splitline("$p.exe: " . $objstr . " $p.rsp"), "\n";
-  print "\tlink \$(LFLAGS) -out:$p.exe -map:$p.map \@$p.rsp\n\n";
+  print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n";
+  print "\tlink \$(LFLAGS) -out:$prog.exe -map:$prog.map \@$prog.rsp\n\n";
 }
 foreach $p (&prognames("GC")) {
-  print $p, ".rsp: \$(MAKEFILE)\n";
+  ($prog, $type) = split ",", $p;
+  print $prog, ".rsp: \$(MAKEFILE)\n";
   $objstr = &objects($p, "X.obj", "X.res", "X.lib");
   @objlist = split " ", $objstr;
   @objlines = ("");
@@ -433,14 +497,17 @@ foreach $p (&prognames("GC")) {
     }
     $objlines[$#objlines] .= " $i";
   }
-  $subsys = ($types{$p} eq "G") ? "windows" : "console";
-  print "\techo /nologo /subsystem:$subsys > $p.rsp\n";
+  $subsys = ($type eq "G") ? "windows" : "console";
+  print "\techo /nologo /subsystem:$subsys > $prog.rsp\n";
   for ($i=0; $i<=$#objlines; $i++) {
-    print "\techo$objlines[$i] >> $p.rsp\n";
+    print "\techo$objlines[$i] >> $prog.rsp\n";
   }
   print "\n";
 }
-&deps("X.obj", "X.res", "", "\\");
+foreach $d (&deps("X.obj", "X.res", "", "\\")) {
+  print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
+      "\n";
+}
 print
 "\n".
 "# Hack to force version.o to be rebuilt always\n".
@@ -466,6 +533,256 @@ print
 "\t-del debug.log\n";
 select STDOUT; close OUT;
 
+##-- MSVC 6 Workspace and projects
+#
+# Note: All files created in this section are written in binary
+# mode, because although MSVC's command-line make can deal with
+# LF-only line endings, MSVC project files really _need_ to be
+# CRLF. Hence, in order for mkfiles.pl to generate usable project
+# files even when run from Unix, I make sure all files are binary
+# and explicitly write the CRLFs.
+#
+# Create directories if necessary
+mkdir 'MSVC'
+	if(! -d 'MSVC');
+chdir 'MSVC';
+@deps = &deps("X.obj", "X.res", "", "\\");
+%all_object_deps = map {$_->{obj} => $_->{deps}} @deps;
+# Create the project files
+# Get names of all Windows projects (GUI and console)
+my @prognames = &prognames("GC");
+foreach $progname (@prognames) {
+	create_project(\%all_object_deps, $progname);
+}
+# Create the workspace file
+open OUT, ">putty.dsw"; binmode OUT; select OUT;
+print
+"Microsoft Developer Studio Workspace File, Format Version 6.00\r\n".
+"# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r\n".
+"\r\n".
+"###############################################################################\r\n".
+"\r\n";
+# List projects
+foreach $progname (@prognames) {
+  ($windows_project, $type) = split ",", $progname;
+	print "Project: \"$windows_project\"=\".\\$windows_project\\$windows_project.dsp\" - Package Owner=<4>\r\n";
+}
+print
+"\r\n".
+"Package=<5>\r\n".
+"{{{\r\n".
+"}}}\r\n".
+"\r\n".
+"Package=<4>\r\n".
+"{{{\r\n".
+"}}}\r\n".
+"\r\n".
+"###############################################################################\r\n".
+"\r\n".
+"Global:\r\n".
+"\r\n".
+"Package=<5>\r\n".
+"{{{\r\n".
+"}}}\r\n".
+"\r\n".
+"Package=<3>\r\n".
+"{{{\r\n".
+"}}}\r\n".
+"\r\n".
+"###############################################################################\r\n".
+"\r\n";
+select STDOUT; close OUT;
+chdir '..';
+
+sub create_project {
+	my ($all_object_deps, $progname) = @_;
+	# Construct program's dependency info
+	%seen_objects = ();
+	%lib_files = ();
+	%source_files = ();
+	%header_files = ();
+	%resource_files = ();
+	@object_files = split " ", &objects($progname, "X.obj", "X.res", "X.lib");
+	foreach $object_file (@object_files) {
+		next if defined $seen_objects{$object_file};
+		$seen_objects{$object_file} = 1;
+		if($object_file =~ /\.lib$/io) {
+			$lib_files{$object_file} = 1;
+			next;
+		}
+		$object_deps = $all_object_deps{$object_file};
+		foreach $object_dep (@$object_deps) {
+			if($object_dep =~ /\.c$/io) {
+				$source_files{$object_dep} = 1;
+				next;
+			}
+			if($object_dep =~ /\.h$/io) {
+				$header_files{$object_dep} = 1;
+				next;
+			}
+			if($object_dep =~ /\.(rc|ico)$/io) {
+				$resource_files{$object_dep} = 1;
+				next;
+			}
+		}
+	}
+	$libs = join " ", sort keys %lib_files;
+	@source_files = sort keys %source_files;
+	@header_files = sort keys %header_files;
+	@resources = sort keys %resource_files;
+  ($windows_project, $type) = split ",", $progname;
+	mkdir $windows_project
+		if(! -d $windows_project);
+	chdir $windows_project;
+  $subsys = ($type eq "G") ? "windows" : "console";
+	open OUT, ">$windows_project.dsp"; binmode OUT; select OUT;
+	print
+	"# Microsoft Developer Studio Project File - Name=\"$windows_project\" - Package Owner=<4>\r\n".
+	"# Microsoft Developer Studio Generated Build File, Format Version 6.00\r\n".
+	"# ** DO NOT EDIT **\r\n".
+	"\r\n".
+	"# TARGTYPE \"Win32 (x86) Application\" 0x0101\r\n".
+	"\r\n".
+	"CFG=$windows_project - Win32 Debug\r\n".
+	"!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r\n".
+	"!MESSAGE use the Export Makefile command and run\r\n".
+	"!MESSAGE \r\n".
+	"!MESSAGE NMAKE /f \"$windows_project.mak\".\r\n".
+	"!MESSAGE \r\n".
+	"!MESSAGE You can specify a configuration when running NMAKE\r\n".
+	"!MESSAGE by defining the macro CFG on the command line. For example:\r\n".
+	"!MESSAGE \r\n".
+	"!MESSAGE NMAKE /f \"$windows_project.mak\" CFG=\"$windows_project - Win32 Debug\"\r\n".
+	"!MESSAGE \r\n".
+	"!MESSAGE Possible choices for configuration are:\r\n".
+	"!MESSAGE \r\n".
+	"!MESSAGE \"$windows_project - Win32 Release\" (based on \"Win32 (x86) Application\")\r\n".
+	"!MESSAGE \"$windows_project - Win32 Debug\" (based on \"Win32 (x86) Application\")\r\n".
+	"!MESSAGE \r\n".
+	"\r\n".
+	"# Begin Project\r\n".
+	"# PROP AllowPerConfigDependencies 0\r\n".
+	"# PROP Scc_ProjName \"\"\r\n".
+	"# PROP Scc_LocalPath \"\"\r\n".
+	"CPP=cl.exe\r\n".
+	"MTL=midl.exe\r\n".
+	"RSC=rc.exe\r\n".
+	"\r\n".
+	"!IF  \"\$(CFG)\" == \"$windows_project - Win32 Release\"\r\n".
+	"\r\n".
+	"# PROP BASE Use_MFC 0\r\n".
+	"# PROP BASE Use_Debug_Libraries 0\r\n".
+	"# PROP BASE Output_Dir \"Release\"\r\n".
+	"# PROP BASE Intermediate_Dir \"Release\"\r\n".
+	"# PROP BASE Target_Dir \"\"\r\n".
+	"# PROP Use_MFC 0\r\n".
+	"# PROP Use_Debug_Libraries 0\r\n".
+	"# PROP Output_Dir \"Release\"\r\n".
+	"# PROP Intermediate_Dir \"Release\"\r\n".
+	"# PROP Ignore_Export_Lib 0\r\n".
+	"# PROP Target_Dir \"\"\r\n".
+	"# ADD BASE CPP /nologo /W3 /GX /O2 /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" /YX /FD /c\r\n".
+	"# ADD CPP /nologo /W3 /GX /O2 /D \"WIN32\" /D \"NDEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" /YX /FD /c\r\n".
+	"# ADD BASE MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n".
+	"# ADD MTL /nologo /D \"NDEBUG\" /mktyplib203 /win32\r\n".
+	"# ADD BASE RSC /l 0x809 /d \"NDEBUG\"\r\n".
+	"# ADD RSC /l 0x809 /d \"NDEBUG\"\r\n".
+	"BSC32=bscmake.exe\r\n".
+	"# ADD BASE BSC32 /nologo\r\n".
+	"# ADD BSC32 /nologo\r\n".
+	"LINK32=link.exe\r\n".
+	"# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:$subsys /machine:I386\r\n".
+	"# ADD LINK32 $libs /nologo /subsystem:$subsys /machine:I386\r\n".
+	"# SUBTRACT LINK32 /pdb:none\r\n".
+	"\r\n".
+	"!ELSEIF  \"\$(CFG)\" == \"$windows_project - Win32 Debug\"\r\n".
+	"\r\n".
+	"# PROP BASE Use_MFC 0\r\n".
+	"# PROP BASE Use_Debug_Libraries 1\r\n".
+	"# PROP BASE Output_Dir \"Debug\"\r\n".
+	"# PROP BASE Intermediate_Dir \"Debug\"\r\n".
+	"# PROP BASE Target_Dir \"\"\r\n".
+	"# PROP Use_MFC 0\r\n".
+	"# PROP Use_Debug_Libraries 1\r\n".
+	"# PROP Output_Dir \"Debug\"\r\n".
+	"# PROP Intermediate_Dir \"Debug\"\r\n".
+	"# PROP Ignore_Export_Lib 0\r\n".
+	"# PROP Target_Dir \"\"\r\n".
+	"# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" /YX /FD /GZ /c\r\n".
+	"# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" /YX /FD /GZ /c\r\n".
+	"# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n".
+	"# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32\r\n".
+	"# ADD BASE RSC /l 0x809 /d \"_DEBUG\"\r\n".
+	"# ADD RSC /l 0x809 /d \"_DEBUG\"\r\n".
+	"BSC32=bscmake.exe\r\n".
+	"# ADD BASE BSC32 /nologo\r\n".
+	"# ADD BSC32 /nologo\r\n".
+	"LINK32=link.exe\r\n".
+	"# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:$subsys /debug /machine:I386 /pdbtype:sept\r\n".
+	"# ADD LINK32 $libs /nologo /subsystem:$subsys /debug /machine:I386 /pdbtype:sept\r\n".
+	"# SUBTRACT LINK32 /pdb:none\r\n".
+	"\r\n".
+	"!ENDIF \r\n".
+	"\r\n".
+	"# Begin Target\r\n".
+	"\r\n".
+	"# Name \"$windows_project - Win32 Release\"\r\n".
+	"# Name \"$windows_project - Win32 Debug\"\r\n".
+	"# Begin Group \"Source Files\"\r\n".
+	"\r\n".
+	"# PROP Default_Filter \"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\"\r\n";
+	foreach $source_file (@source_files) {
+		print
+		"# Begin Source File\r\n".
+		"\r\n".
+		"SOURCE=..\\..\\$source_file\r\n";
+		if($source_file =~ /ssh\.c/io) {
+			# Disable 'Edit and continue' as Visual Studio can't handle the macros
+			print
+			"\r\n".
+			"!IF  \"\$(CFG)\" == \"$windows_project - Win32 Release\"\r\n".
+			"\r\n".
+			"!ELSEIF  \"\$(CFG)\" == \"$windows_project - Win32 Debug\"\r\n".
+			"\r\n".
+			"# ADD CPP /Zi\r\n".
+			"\r\n".
+			"!ENDIF \r\n".
+			"\r\n";
+		}
+		print "# End Source File\r\n";
+	}
+	print
+	"# End Group\r\n".
+	"# Begin Group \"Header Files\"\r\n".
+	"\r\n".
+	"# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\r\n";
+	foreach $header_file (@header_files) {
+		print
+		"# Begin Source File\r\n".
+		"\r\n".
+		"SOURCE=..\\..\\$header_file\r\n".
+		"# End Source File\r\n";
+		}
+	print
+	"# End Group\r\n".
+	"# Begin Group \"Resource Files\"\r\n".
+	"\r\n".
+	"# PROP Default_Filter \"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n";
+	foreach $resource_file (@resources) {
+		print
+		"# Begin Source File\r\n".
+		"\r\n".
+		"SOURCE=..\\..\\$resource_file\r\n".
+		"# End Source File\r\n";
+		}
+	print
+	"# End Group\r\n".
+	"# End Target\r\n".
+	"# End Project\r\n";
+	select STDOUT; close OUT;
+	chdir '..';
+	}
+
 ##-- X/GTK/Unix makefile
 open OUT, ">unix/Makefile.gtk"; select OUT;
 print
@@ -481,31 +798,193 @@ print
 "# TOOLPATH = /opt/gcc/bin\n".
 "CC = \$(TOOLPATH)cc\n".
 "\n".
-&splitline("CFLAGS = -Wall -O2 -I. -I.. `gtk-config --cflags`")."\n".
-"LDFLAGS = -s `gtk-config --libs`\n".
+&splitline("CFLAGS = -O2 -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
+"XLDFLAGS = `gtk-config --libs`\n".
+"ULDFLAGS =#\n".
+"INSTALL=install\n",
+"INSTALL_PROGRAM=\$(INSTALL)\n",
+"INSTALL_DATA=\$(INSTALL)\n",
+"prefix=/usr/local\n",
+"exec_prefix=\$(prefix)\n",
+"bindir=\$(exec_prefix)/bin\n",
+"mandir=\$(prefix)/man\n",
+"man1dir=\$(mandir)/man1\n",
 "\n".
 ".SUFFIXES:\n".
 "\n".
-"%.o: %.c\n".
+"%.o:\n".
 "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n".
 "\n";
-print &splitline("all:" . join "", map { " $_" } &prognames("X"));
+print &splitline("all:" . join "", map { " $_" } &progrealnames("XU"));
 print "\n\n";
-foreach $p (&prognames("X")) {
+foreach $p (&prognames("XU")) {
+  ($prog, $type) = split ",", $p;
   $objstr = &objects($p, "X.o", undef, undef);
-  print &splitline($p . ": " . $objstr), "\n";
+  print &splitline($prog . ": " . $objstr), "\n";
   $libstr = &objects($p, undef, undef, "-lX");
-  print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
+  print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " .
                    $objstr . " $libstr", 69), "\n\n";
 }
-&deps("X.o", undef, "../", "/");
+foreach $d (&deps("X.o", undef, "../", "/")) {
+  print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})),
+      "\n";
+}
 print
 "\n".
 "version.o: FORCE;\n".
 "# Hack to force version.o to be rebuilt always\n".
 "FORCE:\n".
-"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) \$(VER) -c version.c\n".
+"\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) \$(VER) -c ../version.c\n".
 "clean:\n".
-"\trm -f *.o *.exe\n".
+"\trm -f *.o". (join "", map { " $_" } &progrealnames("XU")) . "\n".
+"\n",
+"install:\n",
+map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(DESTDIR)\$(bindir)/$_\n", &progrealnames("XU")),
+map("\t\$(INSTALL_DATA) -m 644 $_ \$(DESTDIR)\$(man1dir)/$_\n", &manpages("XU", "1")),
+"\n",
+"install-strip:\n",
+"\t\$(MAKE) install INSTALL_PROGRAM=\"\$(INSTALL_PROGRAM) -s\"\n",
 "\n";
 select STDOUT; close OUT;
+
+##-- MPW Makefile
+open OUT, ">mac/Makefile.mpw"; select OUT;
+print <<END;
+# Makefile for PuTTY under MPW.
+#
+# This file was created by `mkfiles.pl' from the `Recipe' file.
+# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.
+END
+# MPW command line option is -d not /D
+($_ = $help) =~ s/=\/D/=-d /gs;
+print $_;
+print <<END;
+
+ROptions     = `Echo "{VER}" | StreamEdit -e "1,\$ replace /=(\xc5)\xa81\xb0/ 'STR=\xb6\xb6\xb6\xb6\xb6"' \xa81 '\xb6\xb6\xb6\xb6\xb6"'"`
+
+C_68K = {C}
+C_CFM68K = {C}
+C_PPC = {PPCC}
+C_Carbon = {PPCC}
+
+# -w 35 disables "unused parameter" warnings
+COptions     = -i : -i :: -i ::charset -w 35 -w err -proto strict -ansi on \xb6
+	       -notOnce
+COptions_68K = {COptions} -model far -opt time
+# Enabling "-opt space" for CFM-68K gives me undefined references to
+# _\$LDIVT and _\$LMODT.
+COptions_CFM68K = {COptions} -model cfmSeg -opt time
+COptions_PPC = {COptions} -opt size -traceback
+COptions_Carbon = {COptions} -opt size -traceback -d TARGET_API_MAC_CARBON
+
+Link_68K = ILink
+Link_CFM68K = ILink
+Link_PPC = PPCLink
+Link_Carbon = PPCLink
+
+LinkOptions = -c 'pTTY'
+LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
+LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
+LinkOptions_PPC = {LinkOptions}
+LinkOptions_Carbon = -m __appstart -w {LinkOptions}
+
+Libs_68K =	"{CLibraries}StdCLib.far.o" \xb6
+		"{Libraries}MacRuntime.o" \xb6
+		"{Libraries}MathLib.far.o" \xb6
+		"{Libraries}IntEnv.far.o" \xb6
+		"{Libraries}Interface.o" \xb6
+		"{Libraries}Navigation.far.o" \xb6
+		"{Libraries}OpenTransport.o" \xb6
+		"{Libraries}OpenTransportApp.o" \xb6
+		"{Libraries}OpenTptInet.o" \xb6
+		"{Libraries}UnicodeConverterLib.far.o"
+
+Libs_CFM =	"{SharedLibraries}InterfaceLib" \xb6
+		"{SharedLibraries}StdCLib" \xb6
+		"{SharedLibraries}AppearanceLib" \xb6
+			-weaklib AppearanceLib \xb6
+		"{SharedLibraries}NavigationLib" \xb6
+			-weaklib NavigationLib \xb6
+		"{SharedLibraries}TextCommon" \xb6
+			-weaklib TextCommon \xb6
+		"{SharedLibraries}UnicodeConverter" \xb6
+			-weaklib UnicodeConverter
+
+Libs_CFM68K =	{Libs_CFM} \xb6
+		"{CFM68KLibraries}NuMacRuntime.o"
+
+Libs_PPC =	{Libs_CFM} \xb6
+		"{SharedLibraries}ControlsLib" \xb6
+			-weaklib ControlsLib \xb6
+		"{SharedLibraries}WindowsLib" \xb6
+			-weaklib WindowsLib \xb6
+		"{SharedLibraries}OpenTransportLib" \xb6
+			-weaklib OTClientLib \xb6
+			-weaklib OTClientUtilLib \xb6
+		"{SharedLibraries}OpenTptInternetLib" \xb6
+			-weaklib OTInetClientLib \xb6
+		"{PPCLibraries}StdCRuntime.o" \xb6
+		"{PPCLibraries}PPCCRuntime.o" \xb6
+		"{PPCLibraries}CarbonAccessors.o" \xb6
+		"{PPCLibraries}OpenTransportAppPPC.o" \xb6
+		"{PPCLibraries}OpenTptInetPPC.o"
+
+Libs_Carbon =	"{PPCLibraries}CarbonStdCLib.o" \xb6
+		"{PPCLibraries}StdCRuntime.o" \xb6
+		"{PPCLibraries}PPCCRuntime.o" \xb6
+		"{SharedLibraries}CarbonLib" \xb6
+		"{SharedLibraries}StdCLib"
+
+END
+print &splitline("all \xc4 " . join(" ", &progrealnames("M")), undef, "\xb6");
+print "\n\n";
+foreach $p (&prognames("M")) {
+  ($prog, $type) = split ",", $p;
+
+  print &splitline("$prog \xc4 $prog.68k $prog.ppc $prog.carbon",
+		   undef, "\xb6"), "\n\n";
+
+  $rsrc = &objects($p, "", "X.rsrc", undef);
+
+  foreach $arch (qw(68K CFM68K PPC Carbon)) {
+      $objstr = &objects($p, "X.\L$arch\E.o", "", undef);
+      print &splitline("$prog.\L$arch\E \xc4 $objstr $rsrc", undef, "\xb6");
+      print "\n";
+      print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
+      print &splitline("\t{Link_$arch} -o {Targ} -fragname $prog " .
+		       "{LinkOptions_$arch} " .
+		       $objstr . " {Libs_$arch}", 69, "\xb6"), "\n";
+      print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
+  }
+
+}
+foreach $d (&deps("", "X.rsrc", "::", ":")) {
+  next unless $d->{obj};
+  print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}),
+		   undef, "\xb6"), "\n";
+  print "\tRez ", $d->{deps}->[0], " -o {Targ} {ROptions}\n\n";
+}
+foreach $arch (qw(68K CFM68K)) {
+    foreach $d (&deps("X.\L$arch\E.o", "", "::", ":")) {
+	 next unless $d->{obj};
+	print &splitline(sprintf("%s \xc4 %s", $d->{obj},
+				 join " ", @{$d->{deps}}),
+			 undef, "\xb6"), "\n";
+	 print "\t{C_$arch} ", $d->{deps}->[0],
+	       " -o {Targ} {COptions_$arch}\n\n";
+     }
+}
+foreach $arch (qw(PPC Carbon)) {
+    foreach $d (&deps("X.\L$arch\E.o", "", "::", ":")) {
+	 next unless $d->{obj};
+	print &splitline(sprintf("%s \xc4 %s", $d->{obj},
+				 join " ", @{$d->{deps}}),
+			 undef, "\xb6"), "\n";
+	 # The odd stuff here seems to stop afpd getting confused.
+	 print "\techo -n > {Targ}\n";
+	 print "\tsetfile -t XCOF {Targ}\n";
+	 print "\t{C_$arch} ", $d->{deps}->[0],
+	       " -o {Targ} {COptions_$arch}\n\n";
+     }
+}
+select STDOUT; close OUT;