Miscellaneous fixes to finish up `remove-statics'. rlogin.c had a

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 384a88e..9bd3868 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -604,8 +604,9 @@ 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
+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
@@ -621,6 +622,9 @@ Libs_68K =  "{CLibraries}StdCLib.far.o" \xb6
                "{Libraries}MathLib.far.o" \xb6
                "{Libraries}IntEnv.far.o" \xb6
                "{Libraries}Interface.o" \xb6
+               "{Libraries}OpenTransport.o" \xb6
+               "{Libraries}OpenTransportApp.o" \xb6
+               "{Libraries}OpenTptInet.o" \xb6
                "{Libraries}UnicodeConverterLib.far.o"
 
 Libs_CFM =     "{SharedLibraries}InterfaceLib" \xb6
@@ -636,9 +640,20 @@ 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"
 
 END
 print &splitline("all \xc4 " . join(" ", &progrealnames("M")), undef, "\xb6");
@@ -646,7 +661,7 @@ 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",
                   undef, "\xb6"), "\n\n";
 
   $rsrc = &objects($p, "", "X.rsrc", undef);