X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c88dc003865de6396a5fd0d6402675a5ea8b3237..a5dd84675905dfc4274cf45424e6f3a9e385e1a7:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index fabdc87b..6d4b5528 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -9,9 +9,20 @@
 
 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/", "mac/");
+# 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 prog name + type letter to listref of objects/resources
@@ -173,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 {
@@ -293,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".
@@ -319,6 +336,7 @@ foreach $p (&prognames("GC")) {
   my $mw = $type eq "G" ? " -mwindows" : "";
   $libstr = &objects($p, undef, undef, "-lX");
   print &splitline("\t\$(CC)" . $mw . " \$(LDFLAGS) -o \$@ " .
+                   "-Wl,-Map,$prog.map " .
                    $objstr . " $libstr", 69), "\n\n";
 }
 foreach $d (&deps("X.o", "X.res.o", "", "/")) {
@@ -332,7 +350,7 @@ print
 "FORCE:\n".
 "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) \$(VER) -c version.c\n".
 "clean:\n".
-"\trm -f *.o *.exe *.res.o\n".
+"\trm -f *.o *.exe *.res.o *.map\n".
 "\n";
 select STDOUT; close OUT;
 
@@ -516,6 +534,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
@@ -531,7 +799,7 @@ print
 "# TOOLPATH = /opt/gcc/bin\n".
 "CC = \$(TOOLPATH)cc\n".
 "\n".
-&splitline("CFLAGS = -Wall -g -I. -I.. `gtk-config --cflags`")."\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",
@@ -567,13 +835,17 @@ print
 "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".
+"\tif test -z \"\$(VER)\" && (cd ..; md5sum -c manifest); then \\\n".
+"\t\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) `cat ../version.def` -c ../version.c; \\\n".
+"\telse \\\n".
+"\t\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) \$(VER) -c ../version.c; \\\n".
+"\tfi\n".
 "clean:\n".
 "\trm -f *.o". (join "", map { " $_" } &progrealnames("XU")) . "\n".
 "\n",
 "install:\n",
-map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(bindir)/$_\n", &progrealnames("XU")),
-map("\t\$(INSTALL_DATA) -m 644 $_ \$(man1dir)/$_\n", &manpages("XU", "1")),
+map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(DESTDIR)\$(bindir)/$_\n", &progrealnames("XU")),
+map("\t\$(INSTALL_DATA) -m 644 ../doc/$_ \$(DESTDIR)\$(man1dir)/$_\n", &manpages("XU", "1")),
 "\n",
 "install-strip:\n",
 "\t\$(MAKE) install INSTALL_PROGRAM=\"\$(INSTALL_PROGRAM) -s\"\n",
@@ -593,30 +865,51 @@ END
 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 :: -w 35 -w err -proto strict
-COptions_68K = {COptions} -model far -opt space
+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.
+# _\$LDIVT and _\$LMODT.
 COptions_CFM68K = {COptions} -model cfmSeg -opt time
-COptions_PPC = {COptions} -opt size
+COptions_PPC = {COptions} -opt size -traceback
+COptions_Carbon = {COptions} -opt size -traceback -d TARGET_API_MAC_CARBON
 
-LinkOptions = -c 'pTTY' -fragname PuTTY
+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
@@ -626,9 +919,26 @@ 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
-		"{PPCLibraries}CarbonAccessors.o"
+		"{SharedLibraries}CarbonLib" \xb6
+		"{SharedLibraries}StdCLib"
 
 END
 print &splitline("all \xc4 " . join(" ", &progrealnames("M")), undef, "\xb6");
@@ -636,57 +946,109 @@ print "\n\n";
 foreach $p (&prognames("M")) {
   ($prog, $type) = split ",", $p;
 
-  print &splitline("$prog \xc4 $prog.68k $prog.cfm68k $prog.ppc",
+  print &splitline("$prog \xc4 $prog.68k $prog.ppc $prog.carbon",
 		   undef, "\xb6"), "\n\n";
 
   $rsrc = &objects($p, "", "X.rsrc", undef);
 
-  $objstr = &objects($p, "X.68k.o", "", undef);
-  print &splitline("$prog.68k \xc4 $objstr $rsrc", undef, "\xb6"), "\n";
-  print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
-  print &splitline("\tILink -o {Targ} {LinkOptions_68K} " .
-                   $objstr . " {Libs_68K}", 69, "\xb6"), "\n";
-  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
-
-  $objstr = &objects($p, "X.cfm68k.o", "", undef);
-  print &splitline("$prog.cfm68k \xc4 $objstr", undef, "\xb6"), "\n";
-  print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
-  print &splitline("\tILink -o {Targ} {LinkOptions_CFM68K} " .
-                   $objstr . " {Libs_CFM68K}", 69, "\xb6"), "\n";
-  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
-
-  $objstr = &objects($p, "X.ppc.o", "", undef);
-  print &splitline("$prog.ppc \xc4 $objstr", undef, "\xb6"), "\n";
-  print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
-  print &splitline("\tPPCLink -o {Targ} {LinkOptions_PPC} " .
-                   $objstr . " {Libs_PPC}", 69, "\xb6"), "\n";
-  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
+  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 $d (&deps("X.68k.o", "", "::", ":")) {
-  next unless $d->{obj};
-  print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}),
-		   undef, "\xb6"), "\n";
-  print "\t{C} ", $d->{deps}->[0], " -o {Targ} {COptions_68K}\n\n";
 }
-foreach $d (&deps("X.cfm68k.o", "", "::", ":")) {
-  next unless $d->{obj};
-  print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}),
-		   undef, "\xb6"), "\n";
-  print "\t{C} ", $d->{deps}->[0], " -o {Targ} {COptions_CFM68K}\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 $d (&deps("X.ppc.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{PPCC} ", $d->{deps}->[0], " -o {Targ} {COptions_PPC}\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;
+
+##-- lcc makefile
+open OUT, ">Makefile.lcc"; select OUT;
+print
+"# Makefile for PuTTY under lcc.\n".
+"#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
+"# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
+# lcc command line option is -D not /D
+($_ = $help) =~ s/=\/D/=-D/gs;
+print $_;
+print
+"\n".
+"# If you rename this file to `Makefile', you should change this line,\n".
+"# so that the .rsp files still depend on the correct makefile.\n".
+"MAKEFILE = Makefile.lcc\n".
+"\n".
+"# C compilation flags\n".
+"CFLAGS = -D_WINDOWS\n".
+"\n".
+"# Get include directory for resource compiler\n".
+"\n".
+".c.obj:\n".
+&splitline("\tlcc -O -p6 \$(COMPAT) \$(FWHACK)".
+  " \$(XFLAGS) \$(CFLAGS)  \$*.c",69)."\n".
+".rc.res:\n".
+&splitline("\tlrc \$(FWHACK) \$(RCFL) -r \$*.rc",69)."\n".
+"\n";
+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("$prog.exe: " . $objstr ), "\n";
+  $subsystemtype = undef;
+  if ($prog eq "pageant" || $prog eq "putty" ||$prog eq "puttygen" || $prog eq "puttytel") { 
+	$subsystemtype = "-subsystem  windows";	}
+  my $libss = "shell32.lib wsock32.lib ws2_32.lib winspool.lib winmm.lib imm32.lib";
+  print &splitline("\tlcclnk $subsystemtype -o $prog.exe $objstr $libss");
+  print "\n\n";
 }
+
+
+foreach $d (&deps("X.obj", "X.res", "", "\\")) {
+  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".
+"\tlcc \$(FWHACK) \$(VER) \$(CFLAGS) /c version.c\n\n".
+"clean:\n".
+"\t-del *.obj\n".
+"\t-del *.exe\n".
+"\t-del *.res\n";
+
 select STDOUT; close OUT;
+