X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/c13245009c2ca79087dd317a873dd35dee430842..d1580b2186e981a63dab625aeccca85edee2fcc2:/mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 5ed32918..fabdc87b 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -90,12 +90,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 +188,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/) {
@@ -218,7 +223,7 @@ sub deps {
   @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/;
@@ -596,7 +601,7 @@ COptions_68K = {COptions} -model far -opt space
 COptions_CFM68K = {COptions} -model cfmSeg -opt time
 COptions_PPC = {COptions} -opt size
 
-LinkOptions = -c 'pTTY'
+LinkOptions = -c 'pTTY' -fragname PuTTY
 LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
 LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
 LinkOptions_PPC = {LinkOptions}
@@ -618,8 +623,7 @@ Libs_CFM =	"{SharedLibraries}InterfaceLib" \xb6
 			-weaklib UnicodeConverter
 
 Libs_CFM68K =	{Libs_CFM} \xb6
-		"{CFM68KLibraries}NuMacRuntime.o" \xb6
-		"{CFM68KLibraries}NuMathLib.o"
+		"{CFM68KLibraries}NuMacRuntime.o"
 
 Libs_PPC =	{Libs_CFM} \xb6
 		"{PPCLibraries}StdCRuntime.o" \xb6
@@ -635,32 +639,49 @@ foreach $p (&prognames("M")) {
   print &splitline("$prog \xc4 $prog.68k $prog.cfm68k $prog.ppc",
 		   undef, "\xb6"), "\n\n";
 
-  $objstr = &objects($p, "X.68k.o", undef, undef);
-  print &splitline("$prog.68k \xc4 $objstr", undef, "\xb6"), "\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\n";
+                   $objstr . " {Libs_68K}", 69, "\xb6"), "\n";
+  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
 
-  $objstr = &objects($p, "X.cfm68k.o", undef, undef);
+  $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\n";
+                   $objstr . " {Libs_CFM68K}", 69, "\xb6"), "\n";
+  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
 
-  $objstr = &objects($p, "X.ppc.o", undef, undef);
+  $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\n";
+                   $objstr . " {Libs_PPC}", 69, "\xb6"), "\n";
+  print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
 }
-foreach $d (&deps("X.68k.o", undef, "::", ":")) {
+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", undef, "::", ":")) {
+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", undef, "::", ":")) {
+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.