1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00

More cleanup to Mac build procedures, notably:

- Remove an unused library from the CFM-68K link line.
 - Set the fragment name in CFM builds to "PuTTY".
 - Set the hasBundle and isShared bits on freshly-created applications.

[originally from svn r2383]
This commit is contained in:
Ben Harris 2002-12-30 13:43:19 +00:00
parent cababe03ef
commit f5578ea873

View File

@ -596,7 +596,7 @@ COptions_68K = {COptions} -model far -opt space
COptions_CFM68K = {COptions} -model cfmSeg -opt time COptions_CFM68K = {COptions} -model cfmSeg -opt time
COptions_PPC = {COptions} -opt size COptions_PPC = {COptions} -opt size
LinkOptions = -c 'pTTY' LinkOptions = -c 'pTTY' -fragname PuTTY
LinkOptions_68K = {LinkOptions} -br 68k -model far -compact LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
LinkOptions_PPC = {LinkOptions} LinkOptions_PPC = {LinkOptions}
@ -618,8 +618,7 @@ Libs_CFM = "{SharedLibraries}InterfaceLib" \xb6
-weaklib UnicodeConverter -weaklib UnicodeConverter
Libs_CFM68K = {Libs_CFM} \xb6 Libs_CFM68K = {Libs_CFM} \xb6
"{CFM68KLibraries}NuMacRuntime.o" \xb6 "{CFM68KLibraries}NuMacRuntime.o"
"{CFM68KLibraries}NuMathLib.o"
Libs_PPC = {Libs_CFM} \xb6 Libs_PPC = {Libs_CFM} \xb6
"{PPCLibraries}StdCRuntime.o" \xb6 "{PPCLibraries}StdCRuntime.o" \xb6
@ -638,17 +637,20 @@ foreach $p (&prognames("M")) {
$objstr = &objects($p, "X.68k.o", undef, undef); $objstr = &objects($p, "X.68k.o", undef, undef);
print &splitline("$prog.68k \xc4 $objstr", undef, "\xb6"), "\n"; print &splitline("$prog.68k \xc4 $objstr", undef, "\xb6"), "\n";
print &splitline("\tILink -o {Targ} {LinkOptions_68K} " . 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, undef);
print &splitline("$prog.cfm68k \xc4 $objstr", undef, "\xb6"), "\n"; print &splitline("$prog.cfm68k \xc4 $objstr", undef, "\xb6"), "\n";
print &splitline("\tILink -o {Targ} {LinkOptions_CFM68K} " . 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, undef);
print &splitline("$prog.ppc \xc4 $objstr", undef, "\xb6"), "\n"; print &splitline("$prog.ppc \xc4 $objstr", undef, "\xb6"), "\n";
print &splitline("\tPPCLink -o {Targ} {LinkOptions_PPC} " . 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.68k.o", undef, "::", ":")) {
print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}), print &splitline(sprintf("%s \xc4 %s", $d->{obj}, join " ", @{$d->{deps}}),