Clean up Carbon build procedures somewhat. I still don't have anything that

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index 8c23269..626141b 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -617,13 +617,14 @@ LinkOptions = -c 'pTTY' -fragname PuTTY
 LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
 LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
 LinkOptions_PPC = {LinkOptions}
-LinkOptions_Carbon = {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
@@ -633,6 +634,8 @@ 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
@@ -657,7 +660,11 @@ Libs_PPC = {Libs_CFM} \xb6
                "{PPCLibraries}OpenTransportAppPPC.o" \xb6
                "{PPCLibraries}OpenTptInetPPC.o"
 
-Libs_Carbon =  "{SharedLibraries}CarbonLib"
+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");