X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/32bb2723b68a89f49b16981df81f9b00c17bb9ba..2dc6356a02ebe2e5c0428cefc18e64882d85b4a6:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 3710fcca..384a88e6 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -11,7 +11,12 @@ use FileHandle;
 
 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 prog name + type letter to listref of objects/resources
@@ -57,7 +62,7 @@ while (<IN>) {
     $i = shift @objs;
     if ($groups{$i}) {
       foreach $j (@{$groups{$i}}) { unshift @objs, $j; }
-    } elsif (($i eq "[G]" or $i eq "[C]" or
+    } 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 {
@@ -90,12 +95,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 {
@@ -183,7 +193,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/) {
@@ -198,12 +208,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;
   }
@@ -211,11 +222,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/;
@@ -228,8 +241,9 @@ 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 {
@@ -284,6 +298,9 @@ 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".
@@ -312,7 +329,10 @@ foreach $p (&prognames("GC")) {
   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".
@@ -352,7 +372,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".
@@ -403,7 +423,10 @@ foreach $p (&prognames("GC")) {
   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".
@@ -472,7 +495,10 @@ foreach $p (&prognames("GC")) {
   }
   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".
@@ -513,7 +539,7 @@ print
 "# TOOLPATH = /opt/gcc/bin\n".
 "CC = \$(TOOLPATH)cc\n".
 "\n".
-&splitline("CFLAGS = -Wall -g -I. -I.. `gtk-config --cflags`")."\n".
+&splitline("CFLAGS = -Wall -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
 "XLDFLAGS = `gtk-config --libs`\n".
 "ULDFLAGS =#\n".
 "INSTALL=install\n",
@@ -540,7 +566,10 @@ foreach $p (&prognames("XU")) {
   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".
@@ -558,3 +587,116 @@ map("\t\$(INSTALL_DATA) -m 644 $_ \$(man1dir)/$_\n", &manpages("XU", "1")),
 "\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"'"`
+
+# -w 35 disables "unused parameter" warnings
+COptions     = -i : -i :: -w 35 -w err -proto strict
+COptions_68K = {COptions} -model far -opt space
+# 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
+
+LinkOptions = -c 'pTTY' -fragname PuTTY
+LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
+LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
+LinkOptions_PPC = {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}UnicodeConverterLib.far.o"
+
+Libs_CFM =	"{SharedLibraries}InterfaceLib" \xb6
+		"{SharedLibraries}StdCLib" \xb6
+		"{SharedLibraries}AppearanceLib" \xb6
+			-weaklib AppearanceLib \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
+		"{PPCLibraries}StdCRuntime.o" \xb6
+		"{PPCLibraries}PPCCRuntime.o" \xb6
+		"{PPCLibraries}CarbonAccessors.o"
+
+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.cfm68k $prog.ppc",
+		   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 $rsrc", 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 $rsrc", 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 $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 $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";
+}
+select STDOUT; close OUT;