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

diff --git a/mkfiles.pl b/mkfiles.pl
index fabdc87b..9bd38680 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/", "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 +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".
@@ -531,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",
@@ -593,9 +601,12 @@ 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"'"`
+
 # -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
@@ -611,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
@@ -626,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");
@@ -636,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);
@@ -649,14 +674,14 @@ foreach $p (&prognames("M")) {
   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("$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", undef, "\xb6"), "\n";
+  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";