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

diff --git a/mkfiles.pl b/mkfiles.pl
index fabdc87b..422b8b0e 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
@@ -293,6 +304,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".
@@ -531,7 +545,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",
@@ -593,30 +607,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 +661,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"
+		"{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");
@@ -636,57 +688,50 @@ 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;